From 9aeb78ae9737994b50396da09ed8d7546fd8b779 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Sun, 12 Sep 2021 13:18:40 +0200
Subject: [PATCH] - marked several invisible controller things to not show on
 the automap with the scanner powerup.

am_cheat will still show them.
---
 wadsrc/static/zscript/actors/shared/dynlights.zs        | 1 +
 wadsrc/static/zscript/actors/shared/movingcamera.zs     | 2 ++
 wadsrc/static/zscript/actors/shared/secrettrigger.zs    | 1 +
 wadsrc/static/zscript/actors/shared/sectoraction.zs     | 1 +
 wadsrc/static/zscript/actors/shared/sharedmisc.zs       | 7 +++++++
 wadsrc/static/zscript/actors/shared/soundenvironment.zs | 1 +
 wadsrc/static/zscript/actors/shared/soundsequence.zs    | 3 +++
 wadsrc/static/zscript/actors/shared/teleport.zs         | 1 +
 8 files changed, 17 insertions(+)

diff --git a/wadsrc/static/zscript/actors/shared/dynlights.zs b/wadsrc/static/zscript/actors/shared/dynlights.zs
index 4f6ada88f..e0ac0253c 100644
--- a/wadsrc/static/zscript/actors/shared/dynlights.zs
+++ b/wadsrc/static/zscript/actors/shared/dynlights.zs
@@ -68,6 +68,7 @@ class DynamicLight : Actor
 		+NOGRAVITY
 		+FIXMAPTHINGPOS
 		+INVISIBLE
+		+NOTONAUTOMAP
 	}
 	
 	//==========================================================================
diff --git a/wadsrc/static/zscript/actors/shared/movingcamera.zs b/wadsrc/static/zscript/actors/shared/movingcamera.zs
index 3a254a615..132370008 100644
--- a/wadsrc/static/zscript/actors/shared/movingcamera.zs
+++ b/wadsrc/static/zscript/actors/shared/movingcamera.zs
@@ -53,6 +53,7 @@ class InterpolationPoint : Actor
 		+NOBLOCKMAP
 		+NOGRAVITY
 		+DONTSPLASH
+		+NOTONAUTOMAP
 		RenderStyle "None";
 	}
 	
@@ -119,6 +120,7 @@ class InterpolationSpecial : Actor
 		+NOSECTOR
 		+NOGRAVITY
 		+DONTSPLASH
+		+NOTONAUTOMAP
 	}
 	
 	override void Tick () {}		// Does absolutely nothing itself
diff --git a/wadsrc/static/zscript/actors/shared/secrettrigger.zs b/wadsrc/static/zscript/actors/shared/secrettrigger.zs
index 7a2a78ef4..b664d6b67 100644
--- a/wadsrc/static/zscript/actors/shared/secrettrigger.zs
+++ b/wadsrc/static/zscript/actors/shared/secrettrigger.zs
@@ -7,6 +7,7 @@ class SecretTrigger : Actor
 		+NOSECTOR
 		+NOGRAVITY
 		+DONTSPLASH
+		+NOTONAUTOMAP
 	}
 
 	override void PostBeginPlay ()
diff --git a/wadsrc/static/zscript/actors/shared/sectoraction.zs b/wadsrc/static/zscript/actors/shared/sectoraction.zs
index 8daada166..81bf5d486 100644
--- a/wadsrc/static/zscript/actors/shared/sectoraction.zs
+++ b/wadsrc/static/zscript/actors/shared/sectoraction.zs
@@ -29,6 +29,7 @@ class SectorAction : Actor
 		+NOSECTOR
 		+NOGRAVITY
 		+DONTSPLASH
+		+NOTONAUTOMAP
 	}
 	
 	override void OnDestroy ()
diff --git a/wadsrc/static/zscript/actors/shared/sharedmisc.zs b/wadsrc/static/zscript/actors/shared/sharedmisc.zs
index c837f5f1e..5e146f6c9 100644
--- a/wadsrc/static/zscript/actors/shared/sharedmisc.zs
+++ b/wadsrc/static/zscript/actors/shared/sharedmisc.zs
@@ -31,6 +31,7 @@ class PatrolPoint : Actor
 		+NOGRAVITY
 		+NOBLOCKMAP
 		+DONTSPLASH
+		+NOTONAUTOMAP
 		RenderStyle "None";
 	}
 }	
@@ -47,6 +48,7 @@ class PatrolSpecial : Actor
 		+NOGRAVITY
 		+NOBLOCKMAP
 		+DONTSPLASH
+		+NOTONAUTOMAP
 		RenderStyle "None";
 	}
 }	
@@ -61,6 +63,7 @@ class MapSpot : Actor
 		+NOSECTOR
 		+NOGRAVITY
 		+DONTSPLASH
+		+NOTONAUTOMAP
 		RenderStyle "None";
 		CameraHeight 0;
 	}
@@ -81,6 +84,7 @@ class MapSpotGravity : MapSpot
 		-NOBLOCKMAP
 		-NOSECTOR
 		-NOGRAVITY
+		+NOTONAUTOMAP
 	}
 }
 
@@ -93,6 +97,7 @@ class PointPusher : Actor
 		+NOBLOCKMAP
 		+INVISIBLE
 		+NOCLIP
+		+NOTONAUTOMAP
 	}
 }
 
@@ -103,6 +108,7 @@ class PointPuller : Actor
 		+NOBLOCKMAP
 		+INVISIBLE
 		+NOCLIP
+		+NOTONAUTOMAP
 	}
 }
 
@@ -220,6 +226,7 @@ class SectorFlagSetter : Actor
 	{
 		Super.BeginPlay ();
 		CurSector.Flags |= args[0];
+		Destroy();
 	}
 }
 
diff --git a/wadsrc/static/zscript/actors/shared/soundenvironment.zs b/wadsrc/static/zscript/actors/shared/soundenvironment.zs
index d7317bcbf..69aab2ac3 100644
--- a/wadsrc/static/zscript/actors/shared/soundenvironment.zs
+++ b/wadsrc/static/zscript/actors/shared/soundenvironment.zs
@@ -7,6 +7,7 @@ class SoundEnvironment : Actor
 		+NOBLOCKMAP
 		+NOGRAVITY
 		+DONTSPLASH
+		+NOTONAUTOMAP
 	}
 	
 	override void PostBeginPlay ()
diff --git a/wadsrc/static/zscript/actors/shared/soundsequence.zs b/wadsrc/static/zscript/actors/shared/soundsequence.zs
index 9f2d0c3d7..49a2c28ee 100644
--- a/wadsrc/static/zscript/actors/shared/soundsequence.zs
+++ b/wadsrc/static/zscript/actors/shared/soundsequence.zs
@@ -65,6 +65,7 @@ class AmbientSound : Actor
 		+NOBLOCKMAP
 		+NOSECTOR
 		+DONTSPLASH
+		+NOTONAUTOMAP
 	}
 	
 	native void MarkAmbientSounds();
@@ -100,6 +101,7 @@ class SoundSequenceSlot : Actor
 		+NOSECTOR
 		+NOBLOCKMAP
 		+DONTSPLASH
+		+NOTONAUTOMAP
 	}
 	
 	SeqNode sequence;
@@ -112,6 +114,7 @@ class SoundSequence : Actor
 		+NOSECTOR
 		+NOBLOCKMAP
 		+DONTSPLASH
+		+NOTONAUTOMAP
 	}
 	
 	//==========================================================================
diff --git a/wadsrc/static/zscript/actors/shared/teleport.zs b/wadsrc/static/zscript/actors/shared/teleport.zs
index d4615875b..fcc55e7ab 100644
--- a/wadsrc/static/zscript/actors/shared/teleport.zs
+++ b/wadsrc/static/zscript/actors/shared/teleport.zs
@@ -55,6 +55,7 @@ class TeleportDest : Actor
 		+NOBLOCKMAP
 		+NOSECTOR
 		+DONTSPLASH
+		+NOTONAUTOMAP
 	}
 }