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

Script Editor: fixed an exception when a script configuration contained identical keyword and constant.

Browse source 
ZDoom_DECORATE.cfg: added a bunch of actor properties.
This commit is contained in:
MaxED 2015-01-19 19:53:58 +00:00
parent 7c0711f21e
commit 40a35d399e
2 changed files with 268 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Source/Core/Controls/ScriptEditorControl.cs
View file

@ -122,7 +122,7 @@ namespace CodeImp.DoomBuilder.Controls
scriptedit.IsBufferedDraw = true;
scriptedit.IsCaretLineVisible = false;
scriptedit.IsHScrollBar = true;
scriptedit.IndentationGuides = (int)ScriptIdentGuides.None;
scriptedit.IndentationGuides = (int)ScriptIdentGuides.Real;
scriptedit.IsMouseDownCaptures = true;
scriptedit.IsTabIndents = true;
scriptedit.IsUndoCollection = true;
@ -377,6 +377,12 @@ namespace CodeImp.DoomBuilder.Controls
StringBuilder constantslist = new StringBuilder("");
foreach(string c in scriptconfig.Constants)
{
if(autocompletelist.ContainsKey(c.ToUpperInvariant())) //mxd. This happens when there's a keyword and a constant with the same name...
{
General.ErrorLogger.Add(ErrorType.Error, "Constant '" + c + "' is double-defined in '" + scriptconfig.Description + "' script configuration!");
continue;
}
if(constantslist.Length > 0) constantslist.Append(" ");
constantslist.Append(c);
autocompletelist.Add(c.ToUpperInvariant(), c + "?" + imageindex);