From 4d1901534f8c3cd7fd6d7de6eb0b52bfb980a024 Mon Sep 17 00:00:00 2001
From: Eric Wasylishen <ewasylishen@gmail.com>
Date: Sat, 15 Jan 2022 23:32:30 -0700
Subject: [PATCH] common: fix gamedef_hl_t::get_default_palette()

---
 common/bspfile.cc | 2 +-
 common/imglib.cc  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/bspfile.cc b/common/bspfile.cc
index 93e7511c..6def94cb 100644
--- a/common/bspfile.cc
+++ b/common/bspfile.cc
@@ -407,7 +407,7 @@ struct gamedef_hl_t : public gamedef_q1_like_t<GAME_HALF_LIFE>
 
     const std::vector<qvec3b> &get_default_palette() const
     {
-        static constexpr std::initializer_list<qvec3b> palette{};
+        static const std::vector<qvec3b> palette;
         return palette;
     }
 };
diff --git a/common/imglib.cc b/common/imglib.cc
index 931f74ca..f3eb31bc 100644
--- a/common/imglib.cc
+++ b/common/imglib.cc
@@ -85,7 +85,7 @@ namespace img
             LogPrint("INFO: Falling back to built-in palette.\n");
         }
 
-        auto pal = game->get_default_palette();
+        auto &pal = game->get_default_palette();
 
         std::copy(pal.begin(), pal.end(), std::back_inserter(palette));
     }
@@ -461,4 +461,4 @@ breakOut:;
             LogPrint("WARNING: failed to load or convert textures.\n");
         }
     }
-}
\ No newline at end of file
+}