diff --git a/Build/Scripting/ZDoom_ACS.cfg b/Build/Scripting/ZDoom_ACS.cfg index 5c55f1c6..1ae37c14 100644 --- a/Build/Scripting/ZDoom_ACS.cfg +++ b/Build/Scripting/ZDoom_ACS.cfg @@ -670,6 +670,7 @@ constants DAMAGE_SUBCLASSES_PROTECT; FALSE; FHF_NORANDOMPUFFZ; + FHF_NOIMPACTDECAL; FOGP_DENSITY; FOGP_OUTSIDEDENSITY; FOGP_SKYFOG; diff --git a/Build/Scripting/ZDoom_DECORATE.cfg b/Build/Scripting/ZDoom_DECORATE.cfg index 5b3b1554..bc3813f2 100644 --- a/Build/Scripting/ZDoom_DECORATE.cfg +++ b/Build/Scripting/ZDoom_DECORATE.cfg @@ -59,7 +59,7 @@ keywords A_Srcr2Decide = "A_Srcr2Decide"; A_SwapTeleFog = "A_SwapTeleFog"; A_TurretLook = "A_TurretLook"; - A_Teleport = "A_Teleport[(str teleportstate = \"Teleport\"[, str targettype = \"BossSpot\"[, str fogtype = \"TeleportFog\"[, int flags = 0[, float mindist = 0.0[, float maxdist = 0.0]]]]])]"; + A_Teleport = "A_Teleport[(str teleportstate = \"Teleport\"[, str targettype = \"BossSpot\"[, str fogtype = \"TeleportFog\"[, int flags = 0[, float mindist = 0.0[, float maxdist = 0.0[, int pointer = AAPTR_DEFAULT]]]]]])]"; A_VileChase = "A_VileChase"; A_Wander = "A_Wander"; //Generic monster attacks @@ -870,6 +870,8 @@ constants ALLOWPARTICLES; ALWAYSPUFF; PUFFGETSOWNER; + FORCEDECAL; + NODECAL; SYNCHRONIZED; ALWAYSFAST; NEVERFAST; @@ -1093,8 +1095,10 @@ constants TF_USESPOTZ; TF_NOSRCFOG; TF_NODESTFOG; + TF_NOFOG; TF_USEACTORFOG; TF_NOJUMP; + TF_OVERRIDE; TIF_NOTAKEINFINITE; VAF_DMGTYPEAPPLYTODIRECT; WARPF_ABSOLUTEANGLE; diff --git a/Source/Plugins/BuilderModes/VisualModes/VisualMiddle3D.cs b/Source/Plugins/BuilderModes/VisualModes/VisualMiddle3D.cs index 175509ea..dd7d0c96 100644 --- a/Source/Plugins/BuilderModes/VisualModes/VisualMiddle3D.cs +++ b/Source/Plugins/BuilderModes/VisualModes/VisualMiddle3D.cs @@ -227,7 +227,7 @@ namespace CodeImp.DoomBuilder.BuilderModes foreach(Effect3DFloor ef in sd.ExtraFloors) { //mxd. Walls of solid 3D floors shouldn't be clipped by translucent 3D floors - if(extrafloor.Alpha < 255 || (!extrafloor.RenderInside && !ef.RenderInside && extrafloor.Alpha == 255 & ef.Alpha == 255)) + if(extrafloor.Alpha < 255 || (!extrafloor.RenderInside && !ef.RenderInside && extrafloor.Alpha == 255 && ef.Alpha == 255)) { int num = polygons.Count; for(int pi = 0; pi < num; pi++)