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

Retain argument values if new thing/line action has the same argument(s)

Browse source
This commit is contained in:
spherallic 2023-09-26 15:13:22 +02:00
parent 82ef2ab3de
commit 86422d7498
1 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
Source/Core/Controls/ArgumentsControlSRB2.cs
View file

@ -140,24 +140,26 @@ namespace CodeImp.DoomBuilder.Controls
stringarginfo = General.Map.Config.LinedefActions[showaction].StringArgs;
//mxd. Don't update action args when old and new argument infos match
if (arginfo != null && oldarginfo != null && stringarginfo != null && oldstringarginfo != null && ArgumentInfosMatch(arginfo, oldarginfo) && ArgumentInfosMatch(stringarginfo, oldstringarginfo)) return;
if (arginfo != null && oldarginfo != null && stringarginfo != null && oldstringarginfo != null && ArgumentInfosMatch(arginfo, oldarginfo) && ArgumentInfosMatch(stringarginfo, oldstringarginfo))
return;
// Change the argument descriptions
this.BeginUpdate();
for (int i = 0; i < args.Length; i++)
UpdateArgument(args[i], labels[i], arginfo[i]);
for (int i = 0; i < stringargs.Length; i++)
UpdateStringArgument(stringargs[i], stringlabels[i], stringarginfo[i]);
if (!setuponly)
{
// Apply action's default arguments
if (showaction != 0)
{
for (int i = 0; i < args.Length; i++)
args[i].SetDefaultValue();
if (!ArgumentInfoMatches(arginfo, oldarginfo, i))
args[i].SetDefaultValue();
}
else //or set them to 0
{
@ -166,7 +168,8 @@ namespace CodeImp.DoomBuilder.Controls
}
for (int i = 0; i < stringargs.Length; i++)
stringargs[i].Text = string.Empty;
if (!ArgumentInfoMatches(stringarginfo, oldstringarginfo, i))
stringargs[i].Text = string.Empty;
}
// Store current action
@ -194,7 +197,8 @@ namespace CodeImp.DoomBuilder.Controls
}
//mxd. Don't update args when old and new argument infos match
if (arginfo != null && oldarginfo != null && stringarginfo != null && oldstringarginfo != null && ArgumentInfosMatch(arginfo, oldarginfo) && ArgumentInfosMatch(stringarginfo, oldstringarginfo)) return;
if (arginfo != null && oldarginfo != null && stringarginfo != null && oldstringarginfo != null && ArgumentInfosMatch(arginfo, oldarginfo) && ArgumentInfosMatch(stringarginfo, oldstringarginfo))
return;
// Change the argument descriptions
this.BeginUpdate();
@ -209,7 +213,8 @@ namespace CodeImp.DoomBuilder.Controls
if (info != null)
{
for (int i = 0; i < args.Length; i++)
args[i].SetDefaultValue();
if (!ArgumentInfoMatches(arginfo, oldarginfo, i))
args[i].SetDefaultValue();
}
else //or set them to 0
{
@ -218,7 +223,8 @@ namespace CodeImp.DoomBuilder.Controls
}
for (int i = 0; i < stringargs.Length; i++)
stringargs[i].Text = string.Empty;
if (!ArgumentInfoMatches(stringarginfo, oldstringarginfo, i))
stringargs[i].Text = string.Empty;
this.EndUpdate();
}
@ -283,6 +289,13 @@ namespace CodeImp.DoomBuilder.Controls
return haveusedargs;
}
private static bool ArgumentInfoMatches(ArgumentInfo[] info1, ArgumentInfo[] info2, int i)
{
if (info1 == null || info2 == null) return false;
return !(info1[i].Used != info2[i].Used || info1[i].Type != info2[i].Type
|| info1[i].Title.ToUpperInvariant() != info2[i].Title.ToUpperInvariant());
}
#endregion
#region ================== Redraw control