From 8f49cf38949f5cdcc1173a00d04a63048a196916 Mon Sep 17 00:00:00 2001
From: Eric Wasylishen <ewasylishen@gmail.com>
Date: Sun, 8 Jan 2023 16:04:25 -0700
Subject: [PATCH] refactor: Mod_Q1BSP_DecompressVis -> DecompressVis

---
 common/bsputils.cc         | 12 ++++++------
 include/common/bsputils.hh |  2 +-
 light/ltface.cc            |  6 +++---
 vis/soundpvs.cc            |  8 ++------
 4 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/common/bsputils.cc b/common/bsputils.cc
index 5bddcd03..f4d1013b 100644
--- a/common/bsputils.cc
+++ b/common/bsputils.cc
@@ -603,14 +603,14 @@ size_t DecompressedVisSize(const mbsp_t *bsp)
     return (bsp->dmodels[0].visleafs + 7) / 8;
 }
 
-// from DarkPlaces
-void Mod_Q1BSP_DecompressVis(const uint8_t *in, const uint8_t *inend, uint8_t *out, uint8_t *outend)
+// from DarkPlaces (Mod_Q1BSP_DecompressVis)
+void DecompressVis(const uint8_t *in, const uint8_t *inend, uint8_t *out, uint8_t *outend)
 {
     int c;
     uint8_t *outstart = out;
     while (out < outend) {
         if (in == inend) {
-            logging::print("Mod_Q1BSP_DecompressVis: input underrun (decompressed {} of {} output bytes)\n",
+            logging::print("DecompressVis: input underrun (decompressed {} of {} output bytes)\n",
                 (out - outstart), (outend - outstart));
             return;
         }
@@ -623,20 +623,20 @@ void Mod_Q1BSP_DecompressVis(const uint8_t *in, const uint8_t *inend, uint8_t *o
 
         if (in == inend) {
             logging::print(
-                "Mod_Q1BSP_DecompressVis: input underrun (during zero-run) (decompressed {} of {} output bytes)\n",
+                "DecompressVis: input underrun (during zero-run) (decompressed {} of {} output bytes)\n",
                 (out - outstart), (outend - outstart));
             return;
         }
 
         const int run_length = *in++;
         if (!run_length) {
-            logging::print("Mod_Q1BSP_DecompressVis: 0 repeat\n");
+            logging::print("DecompressVis: 0 repeat\n");
             return;
         }
 
         for (c = run_length; c > 0; c--) {
             if (out == outend) {
-                logging::print("Mod_Q1BSP_DecompressVis: output overrun (decompressed {} of {} output bytes)\n",
+                logging::print("DecompressVis: output overrun (decompressed {} of {} output bytes)\n",
                     (out - outstart), (outend - outstart));
                 return;
             }
diff --git a/include/common/bsputils.hh b/include/common/bsputils.hh
index 6d2cea29..c6219d59 100644
--- a/include/common/bsputils.hh
+++ b/include/common/bsputils.hh
@@ -107,7 +107,7 @@ void Face_DebugPrint(const mbsp_t *bsp, const mface_t *face);
 
 void CompressRow(const uint8_t *vis, const size_t numbytes, std::back_insert_iterator<std::vector<uint8_t>> it);
 size_t DecompressedVisSize(const mbsp_t *bsp);
-void Mod_Q1BSP_DecompressVis(const uint8_t *in, const uint8_t *inend, uint8_t *out, uint8_t *outend);
+void DecompressVis(const uint8_t *in, const uint8_t *inend, uint8_t *out, uint8_t *outend);
 
 bspx_decoupled_lm_perface BSPX_DecoupledLM(const bspxentries_t &entries, int face_num);
 
diff --git a/light/ltface.cc b/light/ltface.cc
index d957d396..41d4eab8 100644
--- a/light/ltface.cc
+++ b/light/ltface.cc
@@ -467,7 +467,7 @@ static bool Mod_LeafPvs(const mbsp_t *bsp, const mleaf_t *leaf, uint8_t *out)
             return false;
         }
 
-        Mod_Q1BSP_DecompressVis(bsp->dvis.bits.data() + bsp->dvis.get_bit_offset(VIS_PVS, leaf->cluster),
+        DecompressVis(bsp->dvis.bits.data() + bsp->dvis.get_bit_offset(VIS_PVS, leaf->cluster),
             bsp->dvis.bits.data() + bsp->dvis.bits.size(), out, out + num_pvsclusterbytes);
     } else {
         if (leaf->visofs < 0) {
@@ -488,8 +488,8 @@ static bool Mod_LeafPvs(const mbsp_t *bsp, const mleaf_t *leaf, uint8_t *out)
             return false;
         }
 
-        Mod_Q1BSP_DecompressVis(bsp->dvis.bits.data() + leaf->visofs, bsp->dvis.bits.data() + bsp->dvis.bits.size(),
-            out, out + num_pvsclusterbytes);
+        DecompressVis(bsp->dvis.bits.data() + leaf->visofs, bsp->dvis.bits.data() + bsp->dvis.bits.size(), out,
+            out + num_pvsclusterbytes);
     }
 
     return true;
diff --git a/vis/soundpvs.cc b/vis/soundpvs.cc
index 1d82ab99..974ca0d9 100644
--- a/vis/soundpvs.cc
+++ b/vis/soundpvs.cc
@@ -172,9 +172,7 @@ void CalcPHS(mbsp_t *bsp)
     for (int32_t i = 0; i < portalleafs; i++) {
         const uint8_t *scan = bsp->dvis.bits.data() + bsp->dvis.get_bit_offset(VIS_PVS, i);
 
-        Mod_Q1BSP_DecompressVis(scan,
-            bsp->dvis.bits.data() + bsp->dvis.bits.size(),
-            uncompressed.data(),
+        DecompressVis(scan, bsp->dvis.bits.data() + bsp->dvis.bits.size(), uncompressed.data(),
             uncompressed.data() + uncompressed.size());
         std::copy(uncompressed.begin(), uncompressed.end(), uncompressed_orig.begin());
 
@@ -192,9 +190,7 @@ void CalcPHS(mbsp_t *bsp)
                 if (index >= portalleafs)
                     FError("Bad bit in PVS"); // pad bits should be 0
                 const uint8_t *src_compressed = bsp->dvis.bits.data() + bsp->dvis.get_bit_offset(VIS_PVS, index);
-                Mod_Q1BSP_DecompressVis(src_compressed,
-                    bsp->dvis.bits.data() + bsp->dvis.bits.size(),
-                    uncompressed_2.data(),
+                DecompressVis(src_compressed, bsp->dvis.bits.data() + bsp->dvis.bits.size(), uncompressed_2.data(),
                     uncompressed_2.data() + uncompressed_2.size());
                 const long *src = reinterpret_cast<long *>(uncompressed_2.data());
                 long *dest = reinterpret_cast<long *>(uncompressed.data());