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

Copy/Paste logic was broken in Doom and Hexen map formats since r1758...

Browse source
This commit is contained in:
MaxED 2013-08-27 14:22:19 +00:00
parent 25c0f0dd1f
commit a6ee7a5ca2
4 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Source/Core/IO/DoomMapSetIO.cs
View file

@ -82,7 +82,7 @@ namespace CodeImp.DoomBuilder.IO
public override float MinCoordinate { get { return short.MinValue; } }
public override int MaxThingAngle { get { return short.MaxValue; } }
public override int MinThingAngle { get { return short.MinValue; } }
public override Dictionary<string, Dictionary<string, UniversalType>> UIFields { get { return null; } } //mxd
public override Dictionary<string, Dictionary<string, UniversalType>> UIFields { get { return uifields; } } //mxd
#endregion

2
Source/Core/IO/HexenMapSetIO.cs
View file

@ -82,7 +82,7 @@ namespace CodeImp.DoomBuilder.IO
public override float MinCoordinate { get { return short.MinValue; } }
public override int MaxThingAngle { get { return short.MaxValue; } }
public override int MinThingAngle { get { return short.MinValue; } }
public override Dictionary<string, Dictionary<string, UniversalType>> UIFields { get { return null; } } //mxd
public override Dictionary<string, Dictionary<string, UniversalType>> UIFields { get { return uifields; } } //mxd
#endregion

4
Source/Core/IO/MapSetIO.cs
View file

@ -42,6 +42,9 @@ namespace CodeImp.DoomBuilder.IO
// Map manager
protected MapManager manager;
//mxd
protected Dictionary<string, Dictionary<string, UniversalType>> uifields;
#endregion
#region ================== Properties
@ -95,6 +98,7 @@ namespace CodeImp.DoomBuilder.IO
// Initialize
this.wad = wad;
this.manager = manager;
this.uifields = new Dictionary<string, Dictionary<string, UniversalType>>(); //mxd
}
#endregion

9
Source/Core/IO/UniversalMapSetIO.cs
View file

@ -36,12 +36,6 @@ namespace CodeImp.DoomBuilder.IO
// Name of the UDMF configuration file
private const string UDMF_UI_CONFIG_NAME = "UDMF_UI.cfg";
#endregion
#region ================== Variables
private Dictionary<string, Dictionary<string, UniversalType>> uifields;
#endregion
#region ================== Constructor / Disposer
@ -54,7 +48,7 @@ namespace CodeImp.DoomBuilder.IO
// Make configuration
Configuration config = new Configuration();
// Find a resource named UDMF_UI.cfg
//mxd. Find a resource named UDMF_UI.cfg
string[] resnames = General.ThisAssembly.GetManifestResourceNames();
foreach(string rn in resnames)
{
@ -68,7 +62,6 @@ namespace CodeImp.DoomBuilder.IO
// Load configuration from stream
config.InputConfiguration(udmfcfgreader.ReadToEnd());
string[] elements = new string[] { "vertex", "linedef", "sidedef", "sector", "thing" };
uifields = new Dictionary<string, Dictionary<string, UniversalType>>();
foreach(string elementname in elements) {
IDictionary dic = config.ReadSetting("uifields." + elementname, new Hashtable());