Added, Game configurations, ZDoom: added Line_SetBlocking (55) linedef action.

Fixed, Draw Rectangle mode: fixed a crash caused by incorrectly changing text labels array when accepting the drawing.
Fixed, "Check unknown ACS scripts" error check: named scripts check was performed incorrectly causing it to fail on script names containing uppercase letters.
This commit is contained in:
MaxED 2016-11-18 17:34:49 +00:00 committed by spherallic
parent 66fb6c39b7
commit 7eafaa4d1a
3 changed files with 51 additions and 17 deletions

View file

@ -656,6 +656,31 @@ zdoom
type = 15; type = 15;
} }
} }
55
{
title = "Line Set Blocking";
id = "Line_SetBlocking";
arg0
{
title = "Target Line Tag";
type = 15;
}
arg1
{
title = "Set Flags";
type = 12;
enum = "linesetblockingflags";
}
arg2
{
title = "Clear Flags";
type = 12;
enum = "linesetblockingflags";
}
}
} }
door door

View file

@ -732,24 +732,20 @@ enums
4 = "Lower"; 4 = "Lower";
} }
generic_door_types linesetblockingflags
{ {
0 = "Open Close"; 0 = "None";
1 = "Open Stay"; 1 = "Block creatures";
2 = "Close Open"; 2 = "Block monsters";
3 = "Close Stay"; 4 = "Block players";
64 = "Open Close (no retrigger)"; 8 = "Block floating creatures";
65 = "Open Stay (no retrigger)"; 16 = "Block projectiles";
66 = "Close Open (no retrigger)"; 32 = "Block all of the above";
67 = "Close Stay (no retrigger)"; 64 = "Strife railing";
128 = "Open Close (tag is light tag)"; 128 = "Block use action";
129 = "Open Stay (tag is light tag)"; 256 = "Block monster line of sight";
130 = "Close Open (tag is light tag)"; 512 = "Block hitscan attacks";
131 = "Close Stay (tag is light tag)"; 1024 = "Block sound";
192 = "Open Close (no retrigger, tag is light tag)";
193 = "Open Stay (no retrigger, tag is light tag)";
194 = "Close Open (no retrigger, tag is light tag)";
195 = "Close Stay (no retrigger, tag is light tag)";
} }
generic_lift_types generic_lift_types

View file

@ -47,6 +47,8 @@ namespace CodeImp.DoomBuilder.BuilderModes
protected int minpointscount; protected int minpointscount;
protected bool alwaysrendershapehints; protected bool alwaysrendershapehints;
private bool blockupdate;
// Interface // Interface
private DrawRectangleOptionsPanel panel; private DrawRectangleOptionsPanel panel;
@ -128,6 +130,8 @@ namespace CodeImp.DoomBuilder.BuilderModes
override protected void Update() override protected void Update()
{ {
if(blockupdate) return;
PixelColor stitchcolor = General.Colors.Highlight; PixelColor stitchcolor = General.Colors.Highlight;
PixelColor losecolor = General.Colors.Selection; PixelColor losecolor = General.Colors.Selection;
@ -193,6 +197,11 @@ namespace CodeImp.DoomBuilder.BuilderModes
renderer.RenderRectangleFilled(new RectangleF(labelCoords[i].x - vsize, labelCoords[i].y - vsize, vsize * 2.0f, vsize * 2.0f), General.Colors.InfoLine, true); renderer.RenderRectangleFilled(new RectangleF(labelCoords[i].x - vsize, labelCoords[i].y - vsize, vsize * 2.0f, vsize * 2.0f), General.Colors.InfoLine, true);
} }
} }
else
{
// Render vertex at points[0]
renderer.RenderRectangleFilled(new RectangleF(start.x - vsize, start.y - vsize, vsize * 2.0f, vsize * 2.0f), General.Colors.InfoLine, true);
}
} }
else else
{ {
@ -354,7 +363,11 @@ namespace CodeImp.DoomBuilder.BuilderModes
points = new List<DrawnVertex>(); //clear points points = new List<DrawnVertex>(); //clear points
Vector2D[] shape = GetShape(start, end); Vector2D[] shape = GetShape(start, end);
// We don't want base.DrawPointAt to call Update() here, because it will mess labels[]
// and trigger shape.Count number of display redraws...
blockupdate = true;
foreach(Vector2D t in shape) base.DrawPointAt(t, true, true); foreach(Vector2D t in shape) base.DrawPointAt(t, true, true);
blockupdate = false;
FinishDraw(); FinishDraw();
} }