From 2a6a381dbd878a41bb327b825ce7a61873ebea13 Mon Sep 17 00:00:00 2001
From: MaxED <j.maxed@gmail.com>
Date: Tue, 17 Jul 2012 12:22:17 +0000
Subject: [PATCH] Fixed Decorate parser error while parsing one line actors.
 Fixed a typo in variable name.

---
 Source/Core/Windows/MainForm.Designer.cs               | 10 +++++-----
 Source/Core/Windows/MainForm.cs                        |  2 +-
 Source/Core/ZDoom/ActorStructure.cs                    |  1 +
 Source/Plugins/BuilderModes/BuilderModes.csproj        |  1 -
 .../Plugins/BuilderModes/Interface/BridgeModeForm.cs   |  1 -
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Source/Core/Windows/MainForm.Designer.cs b/Source/Core/Windows/MainForm.Designer.cs
index 27c69b6b..cc20b013 100644
--- a/Source/Core/Windows/MainForm.Designer.cs
+++ b/Source/Core/Windows/MainForm.Designer.cs
@@ -190,7 +190,7 @@ namespace CodeImp.DoomBuilder.Windows
             this.dockerspanel = new CodeImp.DoomBuilder.Controls.DockersControl();
             this.dockerscollapser = new System.Windows.Forms.Timer(this.components);
             this.warntimer = new System.Windows.Forms.Timer(this.components);
-            this.separatorDrawodes = new System.Windows.Forms.ToolStripSeparator();
+            this.separatorDrawModes = new System.Windows.Forms.ToolStripSeparator();
             toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
             toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
             toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator();
@@ -726,7 +726,7 @@ namespace CodeImp.DoomBuilder.Windows
             // menumode
             // 
             this.menumode.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.separatorDrawodes});
+            this.separatorDrawModes});
             this.menumode.Name = "menumode";
             this.menumode.Size = new System.Drawing.Size(50, 20);
             this.menumode.Text = "&Mode";
@@ -1748,8 +1748,8 @@ namespace CodeImp.DoomBuilder.Windows
             // 
             // separatorDrawodes
             // 
-            this.separatorDrawodes.Name = "separatorDrawodes";
-            this.separatorDrawodes.Size = new System.Drawing.Size(149, 6);
+            this.separatorDrawModes.Name = "separatorDrawModes";
+            this.separatorDrawModes.Size = new System.Drawing.Size(149, 6);
             // 
             // MainForm
             // 
@@ -1949,6 +1949,6 @@ namespace CodeImp.DoomBuilder.Windows
         private System.Windows.Forms.ToolStripMenuItem itemReloadModedef;
         private System.Windows.Forms.ToolStripMenuItem itemReloadGldefs;
         private System.Windows.Forms.ToolStripMenuItem itemReloadMapinfo;
-        private System.Windows.Forms.ToolStripSeparator separatorDrawodes;
+        private System.Windows.Forms.ToolStripSeparator separatorDrawModes;
 	}
 }
\ No newline at end of file
diff --git a/Source/Core/Windows/MainForm.cs b/Source/Core/Windows/MainForm.cs
index 34066ac0..912ed27d 100644
--- a/Source/Core/Windows/MainForm.cs
+++ b/Source/Core/Windows/MainForm.cs
@@ -1839,7 +1839,7 @@ namespace CodeImp.DoomBuilder.Windows
 				case MenuSection.ViewZoom: menuview.DropDownItems.Insert(menuview.DropDownItems.IndexOf(seperatorviewzoom), menu); break;
 				case MenuSection.ViewScriptEdit: menuview.DropDownItems.Add(menu); break;
                 //mxd
-                case MenuSection.ModeDrawModes: menumode.DropDownItems.Insert(menumode.DropDownItems.IndexOf(separatorDrawodes) + 1, menu); break;
+                case MenuSection.ModeDrawModes: menumode.DropDownItems.Insert(menumode.DropDownItems.IndexOf(separatorDrawModes) + 1, menu); break;
 
 				case MenuSection.PrefabsInsert: menuprefabs.DropDownItems.Insert(menuprefabs.DropDownItems.IndexOf(seperatorprefabsinsert), menu); break;
 				case MenuSection.PrefabsCreate: menuprefabs.DropDownItems.Add(menu); break;
diff --git a/Source/Core/ZDoom/ActorStructure.cs b/Source/Core/ZDoom/ActorStructure.cs
index caec72a8..0d80fe8a 100644
--- a/Source/Core/ZDoom/ActorStructure.cs
+++ b/Source/Core/ZDoom/ActorStructure.cs
@@ -349,6 +349,7 @@ namespace CodeImp.DoomBuilder.ZDoom
 								return;
 							}
 							if(v == "\n") break;
+                            if (v == "}") return; //mxd
 							if(v != ",")
 								values.Add(v);
 						}
diff --git a/Source/Plugins/BuilderModes/BuilderModes.csproj b/Source/Plugins/BuilderModes/BuilderModes.csproj
index d03d18b4..8b683a29 100644
--- a/Source/Plugins/BuilderModes/BuilderModes.csproj
+++ b/Source/Plugins/BuilderModes/BuilderModes.csproj
@@ -39,7 +39,6 @@
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
-    <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
diff --git a/Source/Plugins/BuilderModes/Interface/BridgeModeForm.cs b/Source/Plugins/BuilderModes/Interface/BridgeModeForm.cs
index 1e333fd7..375a6f9a 100644
--- a/Source/Plugins/BuilderModes/Interface/BridgeModeForm.cs
+++ b/Source/Plugins/BuilderModes/Interface/BridgeModeForm.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Data;
 using System.Drawing;
 using System.Text;
 using System.Windows.Forms;