stjr/ZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/ZoneBuilder.git synced 2025-01-31 05:00:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Made Visual Mode's "Toggle Slope" feature work for SRB2.

Browse source
This commit is contained in:
MascaraSnake 2016-01-01 22:53:25 +01:00
parent 8a79f18854
commit e398e05358
2 changed files with 44 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Source/Core/Map/Linedef.cs
View file

@ -841,6 +841,18 @@ namespace CodeImp.DoomBuilder.Map
Args[2] = 0; //lineid (irrelevant for SRB2)
}
//Finds the appropriate slope type for the current arguments. Sadly there's no better way to do this generically than to iterate over all types. Oh well.
public void SetSlopeTypeFromArgs()
{
foreach (KeyValuePair<int, int[]> type in General.Map.FormatInterface.SlopeTypes)
{
if ((type.Value[0] == Args[0] && type.Value[1] == Args[1]) || (type.Value[0] == -1 && type.Value[1] == -1)) {
Action = type.Key;
return;
}
}
}
//Set slope arguments for SRB2-style copy slopes. See http://zdoom.org/wiki/Plane_Copy.
public void SetSlopeCopyArgs()
{

59
Source/Plugins/BuilderModes/VisualModes/BaseVisualMode.cs
View file

@ -3597,33 +3597,34 @@ namespace CodeImp.DoomBuilder.BuilderModes
bool update = false;
//assign/remove action
if(vg.GeometryType == VisualGeometryType.WALL_LOWER)
if(vg.GeometryType == VisualGeometryType.WALL_LOWER)
{
// MascaraSnake: Slope handling
if(vg.Sidedef.Line.Action == 0 || (vg.Sidedef.Line.IsSlope && vg.Sidedef.Line.Args[0] == 0))
if(vg.Sidedef.Line.Action == 0 || (vg.Sidedef.Line.IsSlope && vg.Sidedef.Line.Args[0] == 0))
{
//check if the sector already has floor slopes
foreach(Sidedef side in vg.Sidedef.Sector.Sidedefs)
{
// MascaraSnake: Slope handling
if(side == vg.Sidedef || !side.Line.IsSlope) continue;
int arg = (side == side.Line.Front ? 1 : 2);
if(side.Line.Args[0] == arg)
{
//if only floor is affected, remove action
if(side.Line.Args[1] == 0)
side.Line.Action = 0;
else //clear floor alignment
side.Line.Args[0] = 0;
//if only floor is affected, remove action
if (side.Line.Args[1] == 0)
side.Line.Action = 0;
else { //clear floor alignment
side.Line.Args[0] = 0;
side.Line.SetSlopeTypeFromArgs(); //MascaraSnake: Arguments changed, so update slope type
}
}
}
//set action
vg.Sidedef.Line.Action = 181;
vg.Sidedef.Line.Args[0] = (vg.Sidedef == vg.Sidedef.Line.Front ? 1 : 2);
update = true;
vg.Sidedef.Line.SetSlopeTypeFromArgs(); //MascaraSnake: Set slope type
update = true;
}
}
else if(vg.GeometryType == VisualGeometryType.WALL_UPPER)
@ -3634,25 +3635,26 @@ namespace CodeImp.DoomBuilder.BuilderModes
//check if the sector already has ceiling slopes
foreach(Sidedef side in vg.Sidedef.Sector.Sidedefs)
{
// MascaraSnake: Slope handling
if (side == vg.Sidedef || !side.Line.IsSlope) continue;
int arg = (side == side.Line.Front ? 1 : 2);
if(side.Line.Args[1] == arg)
{
//if only ceiling is affected, remove action
if(side.Line.Args[0] == 0)
side.Line.Action = 0;
else //clear ceiling alignment
side.Line.Args[1] = 0;
//if only ceiling is affected, remove action
if (side.Line.Args[0] == 0)
side.Line.Action = 0;
else { //clear ceiling alignment
side.Line.Args[1] = 0;
side.Line.SetSlopeTypeFromArgs(); //MascaraSnake: Arguments changed, so update slope type
}
}
}
//set action
vg.Sidedef.Line.Action = 181;
vg.Sidedef.Line.Args[1] = (vg.Sidedef == vg.Sidedef.Line.Front ? 1 : 2);
update = true;
vg.Sidedef.Line.SetSlopeTypeFromArgs(); //MascaraSnake: Set slope type
update = true;
}
}
else if(vg.GeometryType == VisualGeometryType.CEILING)
@ -3667,13 +3669,15 @@ namespace CodeImp.DoomBuilder.BuilderModes
if(side.Line.Args[1] == arg)
{
//if only ceiling is affected, remove action
if(side.Line.Args[0] == 0)
side.Line.Action = 0;
else //clear ceiling alignment
side.Line.Args[1] = 0;
//if only ceiling is affected, remove action
if (side.Line.Args[0] == 0)
side.Line.Action = 0;
else { //clear ceiling alignment
side.Line.Args[1] = 0;
side.Line.SetSlopeTypeFromArgs(); //MascaraSnake: Arguments changed, so update slope type
}
update = true;
update = true;
}
}
}
@ -3692,10 +3696,11 @@ namespace CodeImp.DoomBuilder.BuilderModes
//if only floor is affected, remove action
if(side.Line.Args[1] == 0)
side.Line.Action = 0;
else //clear floor alignment
else { //clear floor alignment
side.Line.Args[0] = 0;
update = true;
side.Line.SetSlopeTypeFromArgs(); //MascaraSnake: Arguments changed, so update slope type
}
update = true;
}
}
}