Merge pull request #3683 from out-of-phaze/fix/zm-shadower-corruption

Fix 2.5ph ZMimic shadower corruption
NebulaSS13 · Feb 14, 2024 · dfdc8f0 · dfdc8f0
2 parents 0f88fe7 + f382842
commit dfdc8f0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/code/__defines/zmimic.dm b/code/__defines/zmimic.dm
@@ -46,7 +46,9 @@ var/global/list/mimic_defines = list(
 	"ZM_ALLOW_ATMOS",
 	"ZM_MIMIC_NO_AO",
 	"ZM_NO_OCCLUDE",
-	"ZM_MIMIC_BASETURF"
+	"ZM_OVERRIDE",
+	"ZM_NO_SHADOW",
+	"ZM_TERMINATOR"
 )
 
 // Movable flags.

diff --git a/code/controllers/subsystems/zcopy.dm b/code/controllers/subsystems/zcopy.dm
@@ -382,6 +382,7 @@ SUBSYSTEM_DEF(zcopy)
 			// Special case: these are merged into the shadower to reduce memory usage.
 			if (object.type == /atom/movable/lighting_overlay)
 				T.shadower.copy_lighting(object, !(T.below.z_flags & ZM_NO_SHADOW))
+				shadower_set = TRUE
 				continue
 
 			// If an atom already has an overlay, we probably don't need to discover it again.