From 1c8e7e65855ee09990b174c68231e3f595fd4ae7 Mon Sep 17 00:00:00 2001
From: Eric Wasylishen <ewasylishen@gmail.com>
Date: Wed, 6 Jul 2016 00:13:30 -0600
Subject: [PATCH] light: remove use of c99 designated initializers since
 they're not in c++11

---
 include/light/light.h | 21 +++++++++++++++++----
 light/entities.cc     | 26 +++++++++++++-------------
 light/light.cc        | 20 ++++++++++----------
 3 files changed, 40 insertions(+), 27 deletions(-)

diff --git a/include/light/light.h b/include/light/light.h
index 9b26234f..58746388 100644
--- a/include/light/light.h
+++ b/include/light/light.h
@@ -234,15 +234,28 @@ extern bool dump_face;
     
 /* command-line options */
 
-typedef struct {
+class lockable_vec_t {
+public:
     vec_t value;
     bool locked;
-} lockable_vec_t;
+    
+    lockable_vec_t(vec_t v, bool l = false) : value(v), locked(l) {}
+    lockable_vec_t() : lockable_vec_t(0.0f, false) {}
+};
 
-typedef struct {
+class lockable_vec3_t {
+public:
     vec3_t value;
     bool locked;
-} lockable_vec3_t;
+    
+    lockable_vec3_t(const vec3_t v, bool l = false) : locked(l) {
+        VectorCopy(v, value);
+    }
+    lockable_vec3_t(vec_t a, vec_t b, vec_t c, bool l = false) : locked(l) {
+        VectorSet(value, a, b, c);
+    }
+    lockable_vec3_t() : lockable_vec3_t(0.0f, 0.0f, 0.0f, false) {}
+};
 
 /* dirt */
 
diff --git a/light/entities.cc b/light/entities.cc
index 08799b74..aaf08527 100644
--- a/light/entities.cc
+++ b/light/entities.cc
@@ -37,19 +37,19 @@ int num_surfacelight_templates;
 static void MakeSurfaceLights(const bsp2_t *bsp);
 
 /* temporary storage for sunlight settings before the sun_t objects are created. */
-lockable_vec_t sunlight         = { .value = 0,                 .locked = false };  /* main sun */
-lockable_vec3_t sunlight_color  = { .value = { 255, 255, 255 }, .locked = false };
-lockable_vec_t sun2             = { .value = 0,                 .locked = false };  /* second sun */
-lockable_vec3_t sun2_color      = { .value = { 255, 255, 255 }, .locked = false };
-lockable_vec_t sunlight2        = { .value = 0,                 .locked = false };  /* top sky dome */
-lockable_vec3_t sunlight2_color = { .value = { 255, 255, 255 }, .locked = false };
-lockable_vec_t sunlight3        = { .value = 0,                 .locked = false };  /* bottom sky dome */
-lockable_vec3_t sunlight3_color = { .value = { 255, 255, 255 }, .locked = false };
-lockable_vec_t sunlight_dirt    = { .value = 0.0f,              .locked = false };
-lockable_vec_t sunlight2_dirt   = { .value = 0.0f,              .locked = false };
-lockable_vec3_t sunvec          = { .value = { 0, 0, -1 },      .locked = false };  /* defaults to straight down */
-lockable_vec3_t sun2vec         = { .value = { 0, 0, -1 },      .locked = false };  /* defaults to straight down */
-lockable_vec_t sun_deviance     = { .value = 0.0f,              .locked = false };
+lockable_vec_t sunlight         { 0.0f };                   /* main sun */
+lockable_vec3_t sunlight_color  { 255.0f, 255.0f, 255.0f };
+lockable_vec_t sun2             { 0.0f };                   /* second sun */
+lockable_vec3_t sun2_color      { 255.0f, 255.0f, 255.0f };
+lockable_vec_t sunlight2        { 0.0f };                   /* top sky dome */
+lockable_vec3_t sunlight2_color { 255.0f, 255.0f, 255.0f };
+lockable_vec_t sunlight3        { 0.0f };                   /* bottom sky dome */
+lockable_vec3_t sunlight3_color { 255.0f, 255.0f, 255.0f };
+lockable_vec_t sunlight_dirt    { 0.0f };
+lockable_vec_t sunlight2_dirt   { 0.0f };
+lockable_vec3_t sunvec          { 0.0f, 0.0f, -1.0f };  /* defaults to straight down */
+lockable_vec3_t sun2vec         { 0.0f, 0.0f, -1.0f };  /* defaults to straight down */
+lockable_vec_t sun_deviance     { 0.0f };
 
 /*
  * ============================================================================
diff --git a/light/light.cc b/light/light.cc
index 22ec895b..f6112fe7 100644
--- a/light/light.cc
+++ b/light/light.cc
@@ -57,23 +57,23 @@ lightsample_t minlight = { 0, { 255, 255, 255 } };
 sun_t *suns = NULL;
 
 /* dirt */
-lockable_vec_t dirty = {0, false};
-lockable_vec_t dirtMode = {0, false};
-lockable_vec_t dirtDepth = {128.0f, false};
-lockable_vec_t dirtScale = {1.0f, false};
-lockable_vec_t dirtGain = {1.0f, false};
-lockable_vec_t dirtAngle = {88.0f, false};
+lockable_vec_t dirty {0.0f};
+lockable_vec_t dirtMode {0.0f};
+lockable_vec_t dirtDepth {128.0f};
+lockable_vec_t dirtScale {1.0f};
+lockable_vec_t dirtGain {1.0f};
+lockable_vec_t dirtAngle {88.0f};
 
 qboolean globalDirt = false;
 qboolean minlightDirt = false;
 
 /* phong */
-lockable_vec_t phongallowed = {1, false};
+lockable_vec_t phongallowed {1.0f};
 
 /* bounce */
-lockable_vec_t bounce = {0, false};
-lockable_vec_t bouncescale = {1.0f, false};
-lockable_vec_t bouncecolorscale = {0.0f, false};
+lockable_vec_t bounce {0.0f};
+lockable_vec_t bouncescale {1.0f};
+lockable_vec_t bouncecolorscale {0.0f};
 
 qboolean surflight_dump = false;