From 14d8b5f6fc1a1ec6847d617335dc97285ef4f315 Mon Sep 17 00:00:00 2001
From: Eric Wasylishen <ewasylishen@gmail.com>
Date: Thu, 31 Oct 2024 19:05:23 -0600
Subject: [PATCH] common: fix bitflag_names

---
 common/bspfile.cc                | 11 +++++++----
 include/common/bspfile_common.hh |  2 ++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/common/bspfile.cc b/common/bspfile.cc
index 4fcfaeac..3841571d 100644
--- a/common/bspfile.cc
+++ b/common/bspfile.cc
@@ -48,6 +48,9 @@ static std::vector<qvec3b> make_palette(std::initializer_list<uint8_t> bytes)
     return result;
 }
 
+/**
+ * Keep up to date with contents_t enum.
+ */
 static constexpr const char *bitflag_names[] = {
     "SOLID",
     "SKY",
@@ -62,8 +65,8 @@ static constexpr const char *bitflag_names[] = {
     "PLAYERCLIP",
     "MONSTERCLIP",
     "AREAPORTAL",
-    "ILLUSIONARY_VISBLOCKER",
-    "DETAIL",
+    "NO_WATERJUMP",
+    "PROJECTILECLIP",
     "MIRROR_INSIDE",
     "MIRROR_INSIDE_SET",
     "SUPPRESS_CLIPPING_SAME_TYPE",
@@ -77,14 +80,14 @@ static constexpr const char *bitflag_names[] = {
     "LADDER",
     "MONSTER",
     "DEADMONSTER",
+    "ILLUSIONARY_VISBLOCKER",
+    "DETAIL",
     "Q2_UNUSED_7",
     "Q2_UNUSED_8",
     "Q2_UNUSED_9",
     "Q2_UNUSED_10",
     "Q2_UNUSED_11",
     "Q2_UNUSED_12",
-    "Q2_UNUSED_13",
-    "Q2_UNUSED_14",
     "Q2_UNUSED_30",
     "Q2_UNUSED_31",
     "INVALID_BIT_38",
diff --git a/include/common/bspfile_common.hh b/include/common/bspfile_common.hh
index 53e197a9..5c2e41b4 100644
--- a/include/common/bspfile_common.hh
+++ b/include/common/bspfile_common.hh
@@ -52,6 +52,8 @@ using contents_int_t = uint64_t;
 
 /**
  * Superset of Q1- and Q2- features, plus EWT extensions.
+ *
+ * Update bitflag_names if this is changed.
  */
 enum contents_t : contents_int_t {
     EWT_VISCONTENTS_EMPTY = 0,