From 4a85131f457cb02e5b2ad4e7ed663c51f6d4e840 Mon Sep 17 00:00:00 2001
From: Jonathan <jonno.5000@gmail.com>
Date: Thu, 25 Aug 2022 16:46:26 -0400
Subject: [PATCH] fix sky_surface being multiplied by 255 twice (normalize it
 as a color first)

---
 include/common/settings.hh | 6 +++---
 include/light/light.hh     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/common/settings.hh b/include/common/settings.hh
index 674502ee..39deb7c9 100644
--- a/include/common/settings.hh
+++ b/include/common/settings.hh
@@ -642,7 +642,7 @@ public:
     using setting_vec3::setting_vec3;
 
     // allow mangle to only specify pitch, or pitch yaw
-    bool parse(const std::string &settingName, parser_base_t &parser, source source) override
+    bool parse(const std::string &settingName, parser_base_t &parser, bool locked = false) override
     {
         qvec3d vec {};
 
@@ -659,8 +659,8 @@ public:
 
             parser.parse_token();
         }
-
-        setValue(vec, source);
+        
+        setValueFromParse(vec, locked);
 
         return true;
     }
diff --git a/include/light/light.hh b/include/light/light.hh
index 2d059973..3582ee96 100644
--- a/include/light/light.hh
+++ b/include/light/light.hh
@@ -326,7 +326,7 @@ public:
         &worldspawn_group}; /* defaults to straight down */
     setting_mangle sun2vec{this, "sun2_mangle", 0.0, -90.0, 0.0, &worldspawn_group}; /* defaults to straight down */
     setting_scalar sun_deviance{this, "sunlight_penumbra", 0.0, 0.0, 180.0, &worldspawn_group};
-    setting_vec3 sky_surface{
+    setting_color sky_surface{
         this, {"sky_surface", "sun_surface"}, 0, 0, 0, &worldspawn_group} /* arghrad surface lights on sky faces */;
     setting_int32 surflight_radiosity{this, "surflight_radiosity", SURFLIGHT_Q1, &worldspawn_group,
         "whether to use Q1-style surface subdivision (0) or Q2-style surface radiosity"};