stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2025-01-19 06:51:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Show trigger tag associations from sectors to linedefs

Browse source
This commit is contained in:
spherallic 2024-05-01 12:26:48 +02:00
parent b33b609c96
commit 0f9b5ba059
1 changed files with 36 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
Source/Plugins/BuilderModes/General/Association.cs
View file

@ -269,7 +269,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
} }
// Get tags of map elements the element is referencing. This is used for the forward associations // Get tags of map elements the element is referencing. This is used for the forward associations
if (element is Linedef || element is Thing) if (element is Linedef || element is Thing || element is Sector)
actiontags = GetTagsByType(); actiontags = GetTagsByType();
// Store presence of different types once, so that we don't have to do a lookup for each map element // Store presence of different types once, so that we don't have to do a lookup for each map element
@ -293,7 +293,8 @@ namespace CodeImp.DoomBuilder.BuilderModes
addforward = true; addforward = true;
// Check the reverse association (from the sector to the element) // Check the reverse association (from the sector to the element)
// Nothing here yet if (IsAssociatedToSector(s))
addreverse = true;
if (addforward || addreverse) if (addforward || addreverse)
{ {
@ -494,7 +495,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
private Dictionary<int, HashSet<int>> GetTagsByType() private Dictionary<int, HashSet<int>> GetTagsByType()
{ {
LinedefActionInfo action = null; LinedefActionInfo action = null;
int[] actionargs = new int[5]; int[] actionargs = new int[10];
Dictionary<int, HashSet<int>> actiontags = new Dictionary<int, HashSet<int>>(); Dictionary<int, HashSet<int>> actiontags = new Dictionary<int, HashSet<int>>();
// Get the action and its arguments from a linedef or a thing, if they have them // Get the action and its arguments from a linedef or a thing, if they have them
@ -516,7 +517,17 @@ namespace CodeImp.DoomBuilder.BuilderModes
actionargs = t.Args; actionargs = t.Args;
} }
else // element is a Sector else if (element is Sector)
{
Sector s = element as Sector;
int triggertag = s.Fields.GetValue("triggertag", 0);
if (triggertag > 0)
{
actiontags[(int)UniversalType.LinedefTag] = new HashSet<int>{triggertag};
}
}
else
{ {
return actiontags; return actiontags;
} }
@ -645,6 +656,26 @@ namespace CodeImp.DoomBuilder.BuilderModes
return false; return false;
} }
/// <summary>
/// Checks if there's an association between the element and a Sector
/// </summary>
/// <param name="sector">Sector to check the association against</param>
/// <returns>true if the Sector and the element are associated, false if not</returns>
private bool IsAssociatedToSector(Sector sector)
{
int triggertag = sector.Fields.GetValue("triggertag", 0);
if (triggertag > 0 && element is Linedef)
{
Linedef l = element as Linedef;
if (l.Tags.Contains(triggertag))
return true;
}
return false;
}
/// <summary> /// <summary>
/// Returns a string that contains the description of the action and its arguments, based on the given Linedef or Thing /// Returns a string that contains the description of the action and its arguments, based on the given Linedef or Thing
/// </summary> /// </summary>
@ -653,7 +684,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
private string GetActionDescription(SelectableElement se) private string GetActionDescription(SelectableElement se)
{ {
int action = 0; int action = 0;
int[] actionargs = new int[5]; int[] actionargs = new int[10];
if (se is Thing) if (se is Thing)
{ {