stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2025-01-31 04:40:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed Decorate parser error while parsing one line actors.

Browse source 
Fixed a typo in variable name.
This commit is contained in:
MaxED 2012-07-17 12:22:17 +00:00
parent 87731c9650
commit 2a6a381dbd
5 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Source/Core/Windows/MainForm.Designer.cs generated
View file

@ -190,7 +190,7 @@ namespace CodeImp.DoomBuilder.Windows
this.dockerspanel = new CodeImp.DoomBuilder.Controls.DockersControl(); this.dockerspanel = new CodeImp.DoomBuilder.Controls.DockersControl();
this.dockerscollapser = new System.Windows.Forms.Timer(this.components); this.dockerscollapser = new System.Windows.Forms.Timer(this.components);
this.warntimer = 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(); toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator(); toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator(); toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator();
@ -726,7 +726,7 @@ namespace CodeImp.DoomBuilder.Windows
// menumode // menumode
// //
this.menumode.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.menumode.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.separatorDrawodes}); this.separatorDrawModes});
this.menumode.Name = "menumode"; this.menumode.Name = "menumode";
this.menumode.Size = new System.Drawing.Size(50, 20); this.menumode.Size = new System.Drawing.Size(50, 20);
this.menumode.Text = "&Mode"; this.menumode.Text = "&Mode";
@ -1748,8 +1748,8 @@ namespace CodeImp.DoomBuilder.Windows
// //
// separatorDrawodes // separatorDrawodes
// //
this.separatorDrawodes.Name = "separatorDrawodes"; this.separatorDrawModes.Name = "separatorDrawModes";
this.separatorDrawodes.Size = new System.Drawing.Size(149, 6); this.separatorDrawModes.Size = new System.Drawing.Size(149, 6);
// //
// MainForm // MainForm
// //
@ -1949,6 +1949,6 @@ namespace CodeImp.DoomBuilder.Windows
private System.Windows.Forms.ToolStripMenuItem itemReloadModedef; private System.Windows.Forms.ToolStripMenuItem itemReloadModedef;
private System.Windows.Forms.ToolStripMenuItem itemReloadGldefs; private System.Windows.Forms.ToolStripMenuItem itemReloadGldefs;
private System.Windows.Forms.ToolStripMenuItem itemReloadMapinfo; private System.Windows.Forms.ToolStripMenuItem itemReloadMapinfo;
private System.Windows.Forms.ToolStripSeparator separatorDrawodes; private System.Windows.Forms.ToolStripSeparator separatorDrawModes;
} }
} }

2
Source/Core/Windows/MainForm.cs
View file

@ -1839,7 +1839,7 @@ namespace CodeImp.DoomBuilder.Windows
case MenuSection.ViewZoom: menuview.DropDownItems.Insert(menuview.DropDownItems.IndexOf(seperatorviewzoom), menu); break; case MenuSection.ViewZoom: menuview.DropDownItems.Insert(menuview.DropDownItems.IndexOf(seperatorviewzoom), menu); break;
case MenuSection.ViewScriptEdit: menuview.DropDownItems.Add(menu); break; case MenuSection.ViewScriptEdit: menuview.DropDownItems.Add(menu); break;
//mxd //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.PrefabsInsert: menuprefabs.DropDownItems.Insert(menuprefabs.DropDownItems.IndexOf(seperatorprefabsinsert), menu); break;
case MenuSection.PrefabsCreate: menuprefabs.DropDownItems.Add(menu); break; case MenuSection.PrefabsCreate: menuprefabs.DropDownItems.Add(menu); break;

1
Source/Core/ZDoom/ActorStructure.cs
View file

@ -349,6 +349,7 @@ namespace CodeImp.DoomBuilder.ZDoom
return; return;
} }
if(v == "\n") break; if(v == "\n") break;
if (v == "}") return; //mxd
if(v != ",") if(v != ",")
values.Add(v); values.Add(v);
} }

1
Source/Plugins/BuilderModes/BuilderModes.csproj
View file

@ -39,7 +39,6 @@
<Reference Include="System.Core"> <Reference Include="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework> <RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference> </Reference>
<Reference Include="System.Data" />
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />

1
Source/Plugins/BuilderModes/Interface/BridgeModeForm.cs
View file

@ -1,7 +1,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
using System.Data;
using System.Drawing; using System.Drawing;
using System.Text; using System.Text;
using System.Windows.Forms; using System.Windows.Forms;