diff --git a/src/g_shared/a_dynlight.cpp b/src/g_shared/a_dynlight.cpp
index aab54d24b5..65fae7176b 100644
--- a/src/g_shared/a_dynlight.cpp
+++ b/src/g_shared/a_dynlight.cpp
@@ -167,6 +167,7 @@ void ADynamicLight::BeginPlay()
 
 	specialf1 = DAngle(double(SpawnAngle)).Normalized360().Degrees;
 	visibletoplayer = true;
+	mShadowmapIndex = 1024;
 }
 
 //==========================================================================
diff --git a/src/g_shared/a_dynlight.h b/src/g_shared/a_dynlight.h
index a0aede1920..ae2493ca2a 100644
--- a/src/g_shared/a_dynlight.h
+++ b/src/g_shared/a_dynlight.h
@@ -230,9 +230,9 @@ public:
 	bool shadowmapped;
 	int bufferindex;
 	LightFlags lightflags;
-	DAngle SpotInnerAngle = 10.0;
-	DAngle SpotOuterAngle = 25.0;
+	DAngle SpotInnerAngle;
+	DAngle SpotOuterAngle;
     
-    int mShadowmapIndex = 1024;
+    int mShadowmapIndex;
 
 };
diff --git a/wadsrc/static/zscript/shared/dynlights.txt b/wadsrc/static/zscript/shared/dynlights.txt
index c2c005bd88..7310dc18d2 100644
--- a/wadsrc/static/zscript/shared/dynlights.txt
+++ b/wadsrc/static/zscript/shared/dynlights.txt
@@ -35,6 +35,8 @@ class DynamicLight : Actor native
 		Radius 0.1;
 		FloatBobPhase 0;
 		RenderRadius -1;
+		DynamicLight.SpotInnerAngle 10;
+		DynamicLight.SpotOuterAngle 25;
 		+NOBLOCKMAP
 		+NOGRAVITY
 		+FIXMAPTHINGPOS