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

UDMF: fixed an issue where user variables with default values were not saved when their value was equal to the type's default value. Fixes #709

Browse source
This commit is contained in:
biwa 2022-02-26 16:21:59 +01:00
parent c62b8315c4
commit 2dfe043e1e
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Source/Core/Controls/FieldsEditorControl.cs
View file

@ -417,7 +417,7 @@ namespace CodeImp.DoomBuilder.Controls
} }
//mxd //mxd
public void ApplyUserVars(Dictionary<string, UniversalType> vars, UniFields tofields) public void ApplyUserVars(Dictionary<string, UniversalType> vars, Dictionary<string, object> vardefaults, UniFields tofields)
{ {
// Apply user variables when target map element contains user var definition and the value is not default // Apply user variables when target map element contains user var definition and the value is not default
foreach(DataGridViewRow row in fieldslist.Rows) foreach(DataGridViewRow row in fieldslist.Rows)
@ -434,8 +434,11 @@ namespace CodeImp.DoomBuilder.Controls
// Skip field when mixed values // Skip field when mixed values
if(newvalue == null) continue; if(newvalue == null) continue;
// Remove field object typedefault = frow.TypeHandler.GetDefaultValue();
if(newvalue.Equals(frow.TypeHandler.GetDefaultValue())) object userdefault = vardefaults.ContainsKey(frow.Name) ? vardefaults[frow.Name] : typedefault;
// Remove field, but only if the type's default value is the same as the user var's default value
if (newvalue.Equals(typedefault) && typedefault.Equals(userdefault))
{ {
if(tofields.ContainsKey(frow.Name)) tofields.Remove(frow.Name); if(tofields.ContainsKey(frow.Name)) tofields.Remove(frow.Name);
} }

3
Source/Core/Windows/ThingEditFormUDMF.cs
View file

@ -584,9 +584,10 @@ namespace CodeImp.DoomBuilder.Windows
if (ti != null && ti.Actor != null) if (ti != null && ti.Actor != null)
{ {
Dictionary<string, UniversalType> uservars = ti.Actor.GetAllUserVars(); Dictionary<string, UniversalType> uservars = ti.Actor.GetAllUserVars();
Dictionary<string, object> uservardefaults = ti.Actor.GetAllUserVarDefaults();
if(uservars.Count > 0) if(uservars.Count > 0)
fieldslist.ApplyUserVars(uservars, t.Fields); fieldslist.ApplyUserVars(uservars, uservardefaults, t.Fields);
} }
color.ApplyTo(t.Fields, t.Fields.GetValue("fillcolor", 0)); color.ApplyTo(t.Fields, t.Fields.GetValue("fillcolor", 0));