Skip to content
Snippets Groups Projects
Commit 35fd6e1d authored by MaxED's avatar MaxED
Browse files

Fixed, Thig Edit Form, UDMF: Scale x/y linking status was not stored when closing the form.

Fixed, Engine Launcher: "%AP" test parameters placeholder was replaced with "" when current map was newly created and never saved.
parent 487e1478
No related branches found
No related tags found
No related merge requests found
...@@ -30,6 +30,7 @@ namespace CodeImp.DoomBuilder.GZBuilder.Controls ...@@ -30,6 +30,7 @@ namespace CodeImp.DoomBuilder.GZBuilder.Controls
public float ButtonStepBig { get { return value1.ButtonStepBig; } set { value1.ButtonStepBig = value; value2.ButtonStepBig = value; } } public float ButtonStepBig { get { return value1.ButtonStepBig; } set { value1.ButtonStepBig = value; value2.ButtonStepBig = value; } }
public float ButtonStepSmall { get { return value1.ButtonStepSmall; } set { value1.ButtonStepSmall = value; value2.ButtonStepSmall = value; } } public float ButtonStepSmall { get { return value1.ButtonStepSmall; } set { value1.ButtonStepSmall = value; value2.ButtonStepSmall = value; } }
public bool ButtonStepsUseModifierKeys { get { return value1.ButtonStepsUseModifierKeys; } set { value1.ButtonStepsUseModifierKeys = value; value2.ButtonStepsUseModifierKeys = value; } } public bool ButtonStepsUseModifierKeys { get { return value1.ButtonStepsUseModifierKeys; } set { value1.ButtonStepsUseModifierKeys = value; value2.ButtonStepsUseModifierKeys = value; } }
public bool LinkValues { get { return linkValues; } set { linkValues = value; bLink.Image = (linkValues ? Resources.Link : Resources.Unlink); } }
#endregion #endregion
......
...@@ -128,7 +128,7 @@ namespace CodeImp.DoomBuilder ...@@ -128,7 +128,7 @@ namespace CodeImp.DoomBuilder
DataLocationList locations = new DataLocationList(); DataLocationList locations = new DataLocationList();
locations.AddRange(General.Map.ConfigSettings.Resources); locations.AddRange(General.Map.ConfigSettings.Resources);
locations.AddRange(General.Map.Options.Resources); locations.AddRange(General.Map.Options.Resources);
locations.Add(maplocation); if(!string.IsNullOrEmpty(maplocation.location)) locations.Add(maplocation); //mxd. maplocation.location will be empty when a newly created map was not saved yet.
// Go for all data locations // Go for all data locations
foreach(DataLocation dl in locations) foreach(DataLocation dl in locations)
......
...@@ -60,6 +60,9 @@ namespace CodeImp.DoomBuilder.Windows ...@@ -60,6 +60,9 @@ namespace CodeImp.DoomBuilder.Windows
private static Point location = Point.Empty; private static Point location = Point.Empty;
private static int activetab; private static int activetab;
//mxd. Persistent settings
private static bool linkscale;
private struct ThingProperties //mxd private struct ThingProperties //mxd
{ {
//public readonly int Type; //public readonly int Type;
...@@ -154,6 +157,9 @@ namespace CodeImp.DoomBuilder.Windows ...@@ -154,6 +157,9 @@ namespace CodeImp.DoomBuilder.Windows
posZ.AllowDecimal = true; posZ.AllowDecimal = true;
} }
// Value linking
scale.LinkValues = linkscale;
// Setup types list // Setup types list
thingtype.Setup(); thingtype.Setup();
} }
...@@ -677,6 +683,9 @@ namespace CodeImp.DoomBuilder.Windows ...@@ -677,6 +683,9 @@ namespace CodeImp.DoomBuilder.Windows
General.Settings.DefaultThingAngle = Angle2D.DegToRad((float)angle.GetResult((int)Angle2D.RadToDeg(General.Settings.DefaultThingAngle) - 90) + 90); General.Settings.DefaultThingAngle = Angle2D.DegToRad((float)angle.GetResult((int)Angle2D.RadToDeg(General.Settings.DefaultThingAngle) - 90) + 90);
General.Settings.SetDefaultThingFlags(defaultflags); General.Settings.SetDefaultThingFlags(defaultflags);
// Store value linking
linkscale = scale.LinkValues;
// Done // Done
General.Map.IsChanged = true; General.Map.IsChanged = true;
if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty); //mxd if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty); //mxd
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment