From 8b38b7d45fcd6d5edc6d4094c44fc16f17e5b354 Mon Sep 17 00:00:00 2001 From: Eric Wasylishen Date: Sun, 5 Feb 2023 21:30:34 -0700 Subject: [PATCH] light: LIGHTGRID lump: remove special case for 1 lightstyle maps --- light/light.cc | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/light/light.cc b/light/light.cc index dfb06452..0f3ad285 100644 --- a/light/light.cc +++ b/light/light.cc @@ -1124,22 +1124,13 @@ static void LightGrid(bspdata_t *bspdata) str <= grid_mins; str <= num_styles; - // if the map only has 1 style, write a more compact form - if (num_styles == 1) { - // color data 3D array - for (const lightgrid_samples_t &samples : grid_result) { - str <= samples.samples_by_style[0].round_to_int(); + for (const lightgrid_samples_t &samples : grid_result) { + str <= static_cast(samples.used_styles()); + for (int i = 0; i < samples.used_styles(); ++i) { + str <= static_cast(samples.samples_by_style[i].style); } - } else { - // general case - for (const lightgrid_samples_t &samples : grid_result) { - str <= static_cast(samples.used_styles()); - for (int i = 0; i < samples.used_styles(); ++i) { - str <= static_cast(samples.samples_by_style[i].style); - } - for (int i = 0; i < samples.used_styles(); ++i) { - str <= samples.samples_by_style[i].round_to_int(); - } + for (int i = 0; i < samples.used_styles(); ++i) { + str <= samples.samples_by_style[i].round_to_int(); } }