stjr/ZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/ZoneBuilder.git synced 2025-02-07 16:31:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merged in GZDB r2473.

Browse source
This commit is contained in:
MascaraSnake 2016-01-23 03:43:45 +01:00
parent 418c586874
commit 5ca6994d12
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Source/Core/IO/ClipboardStreamReader.cs
View file

@ -132,10 +132,10 @@ namespace CodeImp.DoomBuilder.IO
//flags //flags
Dictionary<string, bool> stringflags = new Dictionary<string, bool>(StringComparer.Ordinal); Dictionary<string, bool> stringflags = new Dictionary<string, bool>(StringComparer.Ordinal);
int numFlags = reader.ReadInt32(); int numFlags = reader.ReadInt32();
for(int f = 0; f < numFlags; f++) stringflags.Add(ReadString(reader), true); for (int f = 0; f < numFlags; f++) stringflags.Add(ReadString(reader), reader.ReadBoolean());
//add missing flags //add missing flags
foreach(KeyValuePair<string, string> flag in General.Map.Config.SectorFlags) foreach (KeyValuePair<string, string> flag in General.Map.Config.SectorFlags)
{ {
if(stringflags.ContainsKey(flag.Key)) continue; if(stringflags.ContainsKey(flag.Key)) continue;
stringflags.Add(flag.Key, false); stringflags.Add(flag.Key, false);
@ -187,10 +187,10 @@ namespace CodeImp.DoomBuilder.IO
//flags //flags
Dictionary<string, bool> stringflags = new Dictionary<string, bool>(StringComparer.Ordinal); Dictionary<string, bool> stringflags = new Dictionary<string, bool>(StringComparer.Ordinal);
int numFlags = reader.ReadInt32(); int numFlags = reader.ReadInt32();
for(int f = 0; f < numFlags; f++) stringflags.Add(ReadString(reader), true); for (int f = 0; f < numFlags; f++) stringflags.Add(ReadString(reader), reader.ReadBoolean());
//add missing flags //add missing flags
foreach(KeyValuePair<string, string> flag in General.Map.Config.LinedefFlags) foreach (KeyValuePair<string, string> flag in General.Map.Config.LinedefFlags)
{ {
if(stringflags.ContainsKey(flag.Key)) continue; if(stringflags.ContainsKey(flag.Key)) continue;
stringflags.Add(flag.Key, false); stringflags.Add(flag.Key, false);
@ -290,11 +290,10 @@ namespace CodeImp.DoomBuilder.IO
//flags //flags
data.Flags = new Dictionary<string, bool>(StringComparer.Ordinal); data.Flags = new Dictionary<string, bool>(StringComparer.Ordinal);
int numFlags = reader.ReadInt32(); int numFlags = reader.ReadInt32();
for(int f = 0; f < numFlags; f++) for (int f = 0; f < numFlags; f++) data.Flags.Add(ReadString(reader), reader.ReadBoolean());
data.Flags.Add(ReadString(reader), true);
//add missing flags //add missing flags
foreach(KeyValuePair<string, string> flag in General.Map.Config.SidedefFlags) foreach (KeyValuePair<string, string> flag in General.Map.Config.SidedefFlags)
{ {
if(data.Flags.ContainsKey(flag.Key)) continue; if(data.Flags.ContainsKey(flag.Key)) continue;
data.Flags.Add(flag.Key, false); data.Flags.Add(flag.Key, false);