cleaned up duplicated doom3 light_radius default value

[xonotic/netradiant.git] / radiant / entity.cpp

diff --git a/radiant/entity.cpp b/radiant/entity.cpp
index 122ebf979defcc595698fdfc03ad1777bea52a76..a68827e6bd4603462b7ae0ffd0808f4f508abf10 100644 (file)
--- a/radiant/entity.cpp
+++ b/radiant/entity.cpp
@@ -178,23 +178,27 @@ void Entity_connectSelected()
   }
 }
 
-const float Doom3Light_defaultRadius = 300;
-
 AABB Doom3Light_getBounds(const AABB& workzone)
 {
   AABB aabb(workzone);
 
+  Vector3 defaultRadius(300, 300, 300);
+  if(!string_parse_vector3(EntityClass_valueForKey(*GlobalEntityClassManager().findOrInsert("light", false), "light_radius"), defaultRadius))
+  {
+    globalErrorStream() << "Doom3Light_getBounds: failed to parse default light radius\n";
+  }
+
   if(aabb.extents[0] == 0)
   {
-    aabb.extents[0] = Doom3Light_defaultRadius;
+    aabb.extents[0] = defaultRadius[0];
   }
   if(aabb.extents[1] == 0)
   {
-    aabb.extents[1] = Doom3Light_defaultRadius;
+    aabb.extents[1] = defaultRadius[1];
   }
   if(aabb.extents[2] == 0)
   {
-    aabb.extents[2] = Doom3Light_defaultRadius;
+    aabb.extents[2] = defaultRadius[2];
   }
 
   if(aabb_valid(aabb))