diff --git a/Source/Core/Rendering/Renderer2D.cs b/Source/Core/Rendering/Renderer2D.cs index 4f84f205..3ba9c230 100644 --- a/Source/Core/Rendering/Renderer2D.cs +++ b/Source/Core/Rendering/Renderer2D.cs @@ -660,7 +660,7 @@ namespace CodeImp.DoomBuilder.Rendering //find lines with 3d floor action and collect sector tags foreach(Linedef l in General.Map.Map.Linedefs) { - if(l.Action == 160) + if(l.Action >= 100 && l.Action < 300) { int sectortag = (General.Map.UDMF || (l.Args[1] & 8) != 0) ? l.Args[0] : l.Args[0] + (l.Args[4] << 8); if(sectortag != 0 && !tags.Contains(sectortag)) tags.Add(sectortag); diff --git a/Source/Plugins/3DFloorMode/BuilderPlug.cs b/Source/Plugins/3DFloorMode/BuilderPlug.cs index 833e1a64..102d7d9c 100644 --- a/Source/Plugins/3DFloorMode/BuilderPlug.cs +++ b/Source/Plugins/3DFloorMode/BuilderPlug.cs @@ -776,7 +776,7 @@ namespace CodeImp.DoomBuilder.ThreeDFloorMode if (ld.Front == null || ld.Front.Sector == null || ld.Front.Sector.IsDisposed || (General.Map.UDMF && ld.Front.Sector.Fields.GetValue("user_managed_3d_floor", false) == false)) continue; - if (ld.Action == 160 && ld.Args[0] != 0) + if ((ld.Action >= 100 && ld.Action < 300) && ld.Args[0] != 0) { if (!tags.ContainsKey(ld.Args[0])) tags.Add(ld.Args[0], new List() { ld.Front.Sector }); diff --git a/Source/Plugins/3DFloorMode/DrawSlopesMode.cs b/Source/Plugins/3DFloorMode/DrawSlopesMode.cs index 6a7b5808..74f9b55e 100644 --- a/Source/Plugins/3DFloorMode/DrawSlopesMode.cs +++ b/Source/Plugins/3DFloorMode/DrawSlopesMode.cs @@ -542,7 +542,7 @@ namespace CodeImp.DoomBuilder.ThreeDFloorMode //Determine whether or not the sector is actually a control sector for a 3D floor foreach (Sidedef sd in s.Sidedefs) { - if (sd.Line.Action == 160) + if (sd.Line.Action >= 100 && sd.Line.Action < 300) return true; } return false; diff --git a/Source/Plugins/3DFloorMode/SlopeVertexGroup.cs b/Source/Plugins/3DFloorMode/SlopeVertexGroup.cs index 697d8106..c5a138ed 100644 --- a/Source/Plugins/3DFloorMode/SlopeVertexGroup.cs +++ b/Source/Plugins/3DFloorMode/SlopeVertexGroup.cs @@ -168,7 +168,7 @@ namespace CodeImp.DoomBuilder.ThreeDFloorMode // tagged sector(s). They will be used for highlighting in slope mode foreach (Sidedef sd in s.Sidedefs) { - if (sd.Line.Action == 160) + if (sd.Line.Action >= 100 && sd.Line.Action < 300) { foreach (Sector ts in BuilderPlug.GetSectorsByTag(sd.Line.Args[0])) { diff --git a/Source/Plugins/3DFloorMode/ThreeDFloor.cs b/Source/Plugins/3DFloorMode/ThreeDFloor.cs index e29911fd..fdda00f2 100644 --- a/Source/Plugins/3DFloorMode/ThreeDFloor.cs +++ b/Source/Plugins/3DFloorMode/ThreeDFloor.cs @@ -132,7 +132,7 @@ namespace CodeImp.DoomBuilder.ThreeDFloorMode foreach (Sidedef sd in sector.Sidedefs) { - if (sd.Line.Action == 160) + if (sd.Line.Action >= 100 && sd.Line.Action < 300) { bordertexture = sd.MiddleTexture; udmftag = sd.Line.Args[0]; @@ -197,7 +197,7 @@ namespace CodeImp.DoomBuilder.ThreeDFloorMode if(ldprops != null) ldprops.Apply(new List() { line }, false); - line.Action = 160; + line.Action = 100; line.Args[0] = tag; line.Args[1] = type; line.Args[2] = flags; @@ -224,7 +224,7 @@ namespace CodeImp.DoomBuilder.ThreeDFloorMode { sd.SetTextureMid(bordertexture); - if (sd.Line.Action == 160) + if (sd.Line.Action >= 100 && sd.Line.Action < 300) { sd.Line.Args[1] = type; sd.Line.Args[2] = flags; @@ -315,7 +315,7 @@ namespace CodeImp.DoomBuilder.ThreeDFloorMode foreach (Sidedef sd in sector.Sidedefs) { - if (sd.Line.Action == 160 && BuilderPlug.GetSectorsByTag(sd.Line.Args[0]).Count == 0) + if ((sd.Line.Action >= 100 && sd.Line.Action < 300) && BuilderPlug.GetSectorsByTag(sd.Line.Args[0]).Count == 0) { sd.Line.Action = 0; diff --git a/Source/Plugins/BuilderModes/ClassicModes/DragGeometryMode.cs b/Source/Plugins/BuilderModes/ClassicModes/DragGeometryMode.cs index 2caf7d1a..572e454c 100755 --- a/Source/Plugins/BuilderModes/ClassicModes/DragGeometryMode.cs +++ b/Source/Plugins/BuilderModes/ClassicModes/DragGeometryMode.cs @@ -443,7 +443,7 @@ namespace CodeImp.DoomBuilder.BuilderModes // sectors that need updating foreach (Linedef ld in General.Map.Map.Linedefs) { - if (ld.Action != 160) // Action 160 defines a 3D floor + if (ld.Action < 100 && ld.Action >= 300) // SRB2 FOF types continue; foreach (Sector s in draggedsectors) diff --git a/Source/Plugins/BuilderModes/ClassicModes/EditSelectionMode.cs b/Source/Plugins/BuilderModes/ClassicModes/EditSelectionMode.cs index d8d02f90..62884a2a 100755 --- a/Source/Plugins/BuilderModes/ClassicModes/EditSelectionMode.cs +++ b/Source/Plugins/BuilderModes/ClassicModes/EditSelectionMode.cs @@ -1648,7 +1648,7 @@ namespace CodeImp.DoomBuilder.BuilderModes { foreach (Linedef ld in General.Map.Map.Linedefs) { - if (ld.Action != 160) // Action 160 defines a 3D floor + if (ld.Action < 100 || ld.Action >= 300) // SRB2 FOF types continue; if (ld.Args[0] == 0) // First argument of the action is the sector tag. 0 is not a valid value diff --git a/Source/Plugins/BuilderModes/ErrorChecks/BaseCheckTextures.cs b/Source/Plugins/BuilderModes/ErrorChecks/BaseCheckTextures.cs index 66f6cfa1..13f84e7d 100644 --- a/Source/Plugins/BuilderModes/ErrorChecks/BaseCheckTextures.cs +++ b/Source/Plugins/BuilderModes/ErrorChecks/BaseCheckTextures.cs @@ -82,7 +82,7 @@ namespace CodeImp.DoomBuilder.BuilderModes foreach (Linedef ld in General.Map.Map.Linedefs) { - if (ld.Action == 160) + if (ld.Action >= 100 && ld.Action < 300) { if ((ld.Args[1] & 4) == 4) // Type render inside { diff --git a/Source/Plugins/BuilderModes/IO/WavefrontExporter.cs b/Source/Plugins/BuilderModes/IO/WavefrontExporter.cs index c86e5108..c4074ffa 100755 --- a/Source/Plugins/BuilderModes/IO/WavefrontExporter.cs +++ b/Source/Plugins/BuilderModes/IO/WavefrontExporter.cs @@ -377,7 +377,7 @@ namespace CodeImp.DoomBuilder.BuilderModes.IO { foreach (Sidedef sd in s.Sidedefs) { - if (sd.Line.Action == 160) + if (sd.Line.Action >= 100 && sd.Line.Action < 300) { addvs = false; break;