From 7622ca1a3bcfacef8dede22f190691522b6ffaa0 Mon Sep 17 00:00:00 2001
From: Eric Wasylishen <ewasylishen@gmail.com>
Date: Mon, 20 Sep 2021 19:38:38 -0600
Subject: [PATCH] bspfile: fix incorrectly identifying bsp2 as hexen2bsp2

---
 common/bspfile.cc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/common/bspfile.cc b/common/bspfile.cc
index 14e7514e..e04e0cd1 100644
--- a/common/bspfile.cc
+++ b/common/bspfile.cc
@@ -60,6 +60,12 @@ BSPVersionSupported(int32_t ident, int32_t version, const bspversion_t **out_ver
 {
     for (const bspversion_t *bspver : bspversions) {
         if (bspver->ident == ident && bspver->version == version) {
+            if (bspver->hexen2) {
+                // HACK: don't detect as Hexen II here, it's done later (isHexen2).
+                // Since the Hexen II bspversion_t's have the same ident/version as Quake
+                // we need to assume Quake.
+                continue;
+            }
             *out_version = bspver;
             return true;
         }