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

Script editor: made the fix for #663 a bit cleaner

Browse source
This commit is contained in:
biwa 2021-12-10 18:13:16 +01:00
parent 0945875bd6
commit a69141c3d0
7 changed files with 1470 additions and 1522 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Source/Core/Config/ScriptConfiguration.cs
View file

@ -28,6 +28,9 @@ using ScintillaNET;
namespace CodeImp.DoomBuilder.Config
{
//mxd
// WARNING: if you add items here you also *must* add icons to the ScriptEditorPanel control (it's in Core\Controls\Scripting)!
// Since this is apparently only used for the script editor (where nothing but DIALOG and ACS can be edited anymore) you
// you can apparently just use UNKNOWN for the script type in classes derived from ZDTextParser
public enum ScriptType
{
UNKNOWN,
@ -53,9 +56,6 @@ namespace CodeImp.DoomBuilder.Config
KEYCONF,
FONTDEFS,
ZSCRIPT,
DECALDEF,
DEHACKED,
IWADINFO,
}
public class ScriptConfiguration : IComparable<ScriptConfiguration>

95
Source/Core/Controls/Scripting/ScriptEditorPanel.Designer.cs generated
View file

@ -770,55 +770,52 @@ namespace CodeImp.DoomBuilder.Controls
this.scripticons.Images.SetKeyName(24, "ScriptKEYCONF.png");
this.scripticons.Images.SetKeyName(25, "ScriptFONTDEFS.png");
this.scripticons.Images.SetKeyName(26, "ScriptZSCRIPT.png");
this.scripticons.Images.SetKeyName(27, "ScriptDECALDEF.png");
this.scripticons.Images.SetKeyName(28, "ScriptDEHACKED.png");
this.scripticons.Images.SetKeyName(29, "ScriptIWADINFO.png");
this.scripticons.Images.SetKeyName(30, "GroupUnknown.png");
this.scripticons.Images.SetKeyName(31, "GroupACS.png");
this.scripticons.Images.SetKeyName(32, "GroupMODELDEF.png");
this.scripticons.Images.SetKeyName(33, "GroupDECORATE.png");
this.scripticons.Images.SetKeyName(34, "GroupGLDEFS.png");
this.scripticons.Images.SetKeyName(35, "GroupSNDSEQ.png");
this.scripticons.Images.SetKeyName(36, "GroupMAPINFO.png");
this.scripticons.Images.SetKeyName(37, "GroupVOXELDEF.png");
this.scripticons.Images.SetKeyName(38, "GroupTEXTURES.png");
this.scripticons.Images.SetKeyName(39, "GroupANIMDEFS.png");
this.scripticons.Images.SetKeyName(40, "GroupREVERBS.png");
this.scripticons.Images.SetKeyName(41, "GroupTERRAIN.png");
this.scripticons.Images.SetKeyName(42, "GroupX11.png");
this.scripticons.Images.SetKeyName(43, "GroupCVARINFO.png");
this.scripticons.Images.SetKeyName(44, "GroupSNDINFO.png");
this.scripticons.Images.SetKeyName(45, "GroupLOCKDEFS.png");
this.scripticons.Images.SetKeyName(46, "GroupMENUDEF.png");
this.scripticons.Images.SetKeyName(47, "GroupSBARINFO.png");
this.scripticons.Images.SetKeyName(48, "GroupUSDF.png");
this.scripticons.Images.SetKeyName(49, "GroupGAMEINFO.png");
this.scripticons.Images.SetKeyName(50, "GroupKEYCONF.png");
this.scripticons.Images.SetKeyName(51, "GroupFONTDEFS.png");
this.scripticons.Images.SetKeyName(52, "GroupZSCRIPT.png");
this.scripticons.Images.SetKeyName(53, "GroupOpen.png");
this.scripticons.Images.SetKeyName(54, "OpenGroupACS.png");
this.scripticons.Images.SetKeyName(55, "OpenGroupMODELDEF.png");
this.scripticons.Images.SetKeyName(56, "OpenGroupDECORATE.png");
this.scripticons.Images.SetKeyName(57, "OpenGroupGLDEFS.png");
this.scripticons.Images.SetKeyName(58, "OpenGroupSNDSEQ.png");
this.scripticons.Images.SetKeyName(59, "OpenGroupMAPINFO.png");
this.scripticons.Images.SetKeyName(60, "OpenGroupVOXELDEF.png");
this.scripticons.Images.SetKeyName(61, "OpenGroupTEXTURES.png");
this.scripticons.Images.SetKeyName(62, "OpenGroupANIMDEFS.png");
this.scripticons.Images.SetKeyName(63, "OpenGroupREVERBS.png");
this.scripticons.Images.SetKeyName(64, "OpenGroupTERRAIN.png");
this.scripticons.Images.SetKeyName(65, "OpenGroupX11.png");
this.scripticons.Images.SetKeyName(66, "OpenGroupCVARINFO.png");
this.scripticons.Images.SetKeyName(67, "OpenGroupSNDINFO.png");
this.scripticons.Images.SetKeyName(68, "OpenGroupLOCKDEFS.png");
this.scripticons.Images.SetKeyName(69, "OpenGroupMENUDEF.png");
this.scripticons.Images.SetKeyName(70, "OpenGroupSBARINFO.png");
this.scripticons.Images.SetKeyName(71, "OpenGroupUSDF.png");
this.scripticons.Images.SetKeyName(72, "OpenGroupGAMEINFO.png");
this.scripticons.Images.SetKeyName(73, "OpenGroupKEYCONF.png");
this.scripticons.Images.SetKeyName(74, "OpenGroupFONTDEFS.png");
this.scripticons.Images.SetKeyName(75, "OpenGroupZSCRIPT.png");
this.scripticons.Images.SetKeyName(27, "GroupUnknown.png");
this.scripticons.Images.SetKeyName(28, "GroupACS.png");
this.scripticons.Images.SetKeyName(29, "GroupMODELDEF.png");
this.scripticons.Images.SetKeyName(30, "GroupDECORATE.png");
this.scripticons.Images.SetKeyName(31, "GroupGLDEFS.png");
this.scripticons.Images.SetKeyName(32, "GroupSNDSEQ.png");
this.scripticons.Images.SetKeyName(33, "GroupMAPINFO.png");
this.scripticons.Images.SetKeyName(34, "GroupVOXELDEF.png");
this.scripticons.Images.SetKeyName(35, "GroupTEXTURES.png");
this.scripticons.Images.SetKeyName(36, "GroupANIMDEFS.png");
this.scripticons.Images.SetKeyName(37, "GroupREVERBS.png");
this.scripticons.Images.SetKeyName(38, "GroupTERRAIN.png");
this.scripticons.Images.SetKeyName(39, "GroupX11.png");
this.scripticons.Images.SetKeyName(40, "GroupCVARINFO.png");
this.scripticons.Images.SetKeyName(41, "GroupSNDINFO.png");
this.scripticons.Images.SetKeyName(42, "GroupLOCKDEFS.png");
this.scripticons.Images.SetKeyName(43, "GroupMENUDEF.png");
this.scripticons.Images.SetKeyName(44, "GroupSBARINFO.png");
this.scripticons.Images.SetKeyName(45, "GroupUSDF.png");
this.scripticons.Images.SetKeyName(46, "GroupGAMEINFO.png");
this.scripticons.Images.SetKeyName(47, "GroupKEYCONF.png");
this.scripticons.Images.SetKeyName(48, "GroupFONTDEFS.png");
this.scripticons.Images.SetKeyName(49, "GroupZSCRIPT.png");
this.scripticons.Images.SetKeyName(50, "GroupOpen.png");
this.scripticons.Images.SetKeyName(51, "OpenGroupACS.png");
this.scripticons.Images.SetKeyName(52, "OpenGroupMODELDEF.png");
this.scripticons.Images.SetKeyName(53, "OpenGroupDECORATE.png");
this.scripticons.Images.SetKeyName(54, "OpenGroupGLDEFS.png");
this.scripticons.Images.SetKeyName(55, "OpenGroupSNDSEQ.png");
this.scripticons.Images.SetKeyName(56, "OpenGroupMAPINFO.png");
this.scripticons.Images.SetKeyName(57, "OpenGroupVOXELDEF.png");
this.scripticons.Images.SetKeyName(58, "OpenGroupTEXTURES.png");
this.scripticons.Images.SetKeyName(59, "OpenGroupANIMDEFS.png");
this.scripticons.Images.SetKeyName(60, "OpenGroupREVERBS.png");
this.scripticons.Images.SetKeyName(61, "OpenGroupTERRAIN.png");
this.scripticons.Images.SetKeyName(62, "OpenGroupX11.png");
this.scripticons.Images.SetKeyName(63, "OpenGroupCVARINFO.png");
this.scripticons.Images.SetKeyName(64, "OpenGroupSNDINFO.png");
this.scripticons.Images.SetKeyName(65, "OpenGroupLOCKDEFS.png");
this.scripticons.Images.SetKeyName(66, "OpenGroupMENUDEF.png");
this.scripticons.Images.SetKeyName(67, "OpenGroupSBARINFO.png");
this.scripticons.Images.SetKeyName(68, "OpenGroupUSDF.png");
this.scripticons.Images.SetKeyName(69, "OpenGroupGAMEINFO.png");
this.scripticons.Images.SetKeyName(70, "OpenGroupKEYCONF.png");
this.scripticons.Images.SetKeyName(71, "OpenGroupFONTDEFS.png");
this.scripticons.Images.SetKeyName(72, "OpenGroupZSCRIPT.png");
//
// projecticons
//

2881
Source/Core/Controls/Scripting/ScriptEditorPanel.resx
View file

File diff suppressed because it is too large Load diff

2
Source/Core/Data/DataManager.cs
View file

@ -2966,7 +2966,7 @@ namespace CodeImp.DoomBuilder.Data
foreach(DataReader dr in containers)
{
currentreader = dr; // Why?
IEnumerable<TextResourceData> streams = dr.GetTextLumpData(ScriptType.DECALDEF, false, false);
IEnumerable<TextResourceData> streams = dr.GetTextLumpData(ScriptType.UNKNOWN, false, false);
// Parse the data
foreach(TextResourceData data in streams)

4
Source/Core/Dehacked/DehackedParser.cs
View file

@ -212,7 +212,7 @@ namespace CodeImp.DoomBuilder.Dehacked
message = "Dehacked warning in \"" + errsource + "\" line " + linenumber + ". " + message + ".";
TextResourceErrorItem error = new TextResourceErrorItem(ErrorType.Warning, ScriptType.DEHACKED, datalocation, sourcename, sourcelumpindex, linenumber, message);
TextResourceErrorItem error = new TextResourceErrorItem(ErrorType.Warning, ScriptType.UNKNOWN, datalocation, sourcename, sourcelumpindex, linenumber, message);
General.ErrorLogger.Add(error);
}
@ -228,7 +228,7 @@ namespace CodeImp.DoomBuilder.Dehacked
message = "Dehacked error in \"" + errsource + "\" line " + linenumber + ". " + message + ".";
TextResourceErrorItem error = new TextResourceErrorItem(ErrorType.Error, ScriptType.DEHACKED, datalocation, sourcename, sourcelumpindex, linenumber, message);
TextResourceErrorItem error = new TextResourceErrorItem(ErrorType.Error, ScriptType.UNKNOWN, datalocation, sourcename, sourcelumpindex, linenumber, message);
General.ErrorLogger.Add(error);
}

2
Source/Core/ZDoom/DecalDefsParser.cs
View file

@ -46,7 +46,7 @@ namespace CodeImp.DoomBuilder.ZDoom
#region ================== Properties
internal override ScriptType ScriptType { get { return ScriptType.DECALDEF; } }
internal override ScriptType ScriptType { get { return ScriptType.UNKNOWN; } }
public Dictionary<string, DecalInfo> Decals { get { return decals; } }
#endregion

2
Source/Core/ZDoom/IWadInfoParser.cs
View file

@ -41,7 +41,7 @@ namespace CodeImp.DoomBuilder.ZDoom
#region ================== Properties
internal override ScriptType ScriptType { get { return ScriptType.IWADINFO; } }
internal override ScriptType ScriptType { get { return ScriptType.UNKNOWN; } }
public List<IWadInfo> IWads { get { return iwads; } }
#endregion