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 const std::vector &get_default_palette() const { - static constexpr std::initializer_list palette{}; + static const std::vector 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 +}