From 295c9bc35ceb51cd2e607b18bba270976ad720d2 Mon Sep 17 00:00:00 2001 From: MaxED Date: Tue, 24 Nov 2015 10:46:49 +0000 Subject: [PATCH] Fixed, ACC compiler: in some cases ACC errors were ignored. Fixed, Script Editor, cosmetic: we should not show error line number when we don't have one. ZDoom acc.exe: several error types now output more detailed info. Fixed, Visual mode: UDMF thing alpha property was applied only when UDMF renderstyle property was also set (should also be applied when renderstyle property is set in the DECORATE actor definition). Game configurations, ZDoom family: Pistol and Gold Wand actors now use internal sprites. Updated ZDoom ACC and ZDoom_ACS.cfg (PickActor flags). --- Build/Compilers/ZDoom/acc.exe | Bin 66560 -> 66560 bytes Build/Compilers/ZDoom/zdefs.acs | 5 +++++ .../Configurations/Includes/ZDoom_things.cfg | 4 ++-- Build/Scripting/ZDoom_ACS.cfg | 2 ++ Build/Sprites/ZDoomGoldWand.png | Bin 0 -> 315 bytes Build/Sprites/ZDoomPistol.png | Bin 0 -> 297 bytes Source/Core/Compilers/AccCompiler.cs | 8 ++++++++ Source/Core/Controls/ScriptEditorPanel.cs | 7 +++---- .../VisualModes/BaseVisualThing.cs | 7 ++++++- 9 files changed, 26 insertions(+), 7 deletions(-) create mode 100644 Build/Sprites/ZDoomGoldWand.png create mode 100644 Build/Sprites/ZDoomPistol.png diff --git a/Build/Compilers/ZDoom/acc.exe b/Build/Compilers/ZDoom/acc.exe index b9efc7755d64bf1fe608f5aa5d35b17a3fc59a52..a60988bc63c0372dbe99613c56495361c728cc99 100644 GIT binary patch delta 5783 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 diff --git a/Build/Compilers/ZDoom/zdefs.acs b/Build/Compilers/ZDoom/zdefs.acs index bdcec78e..9533b0a2 100644 --- a/Build/Compilers/ZDoom/zdefs.acs +++ b/Build/Compilers/ZDoom/zdefs.acs @@ -984,6 +984,11 @@ #define FHF_NORANDOMPUFFZ 1 #define FHF_NOIMPACTDECAL 2 +// PickActor flags + +#define PICKAF_FORCETID 1 +#define PICKAF_RETURNTID 2 + // Actor flags #define MF_SPECIAL 0x00000001 #define MF_SOLID 0x00000002 diff --git a/Build/Configurations/Includes/ZDoom_things.cfg b/Build/Configurations/Includes/ZDoom_things.cfg index 258380b9..1b824e49 100644 --- a/Build/Configurations/Includes/ZDoom_things.cfg +++ b/Build/Configurations/Includes/ZDoom_things.cfg @@ -1486,7 +1486,7 @@ doom 5010 { title = "Pistol"; - sprite = "PISTA0"; + sprite = "internal:ZDoomPistol"; class = "Pistol"; } } @@ -1653,7 +1653,7 @@ heretic 9042 { title = "Gold Wand"; - sprite = "GWANA0"; + sprite = "internal:ZDoomGoldWand"; class = "GoldWand"; } } diff --git a/Build/Scripting/ZDoom_ACS.cfg b/Build/Scripting/ZDoom_ACS.cfg index 5e316b86..192310d3 100644 --- a/Build/Scripting/ZDoom_ACS.cfg +++ b/Build/Scripting/ZDoom_ACS.cfg @@ -841,6 +841,8 @@ constants NOT_TOP; OFF; ON; + PICKAF_FORCETID; + PICKAF_RETURNTID; PLAYERINFO_AIMDIST; PLAYERINFO_COLOR; PLAYERINFO_DESIREDFOV; diff --git a/Build/Sprites/ZDoomGoldWand.png b/Build/Sprites/ZDoomGoldWand.png new file mode 100644 index 0000000000000000000000000000000000000000..f887f04c65d070bff04ff7b7d19354a91daf471a GIT binary patch literal 315 zcmeAS@N?(olHy`uVBq!ia0vp^oItG3!3-o{y_}Q+q&U)x9Fu@FNJvdwaFREWjtcMz zaTO2{U}9oYQBiSobF;RwUYRbHnwn~EZf+>eXDiR==jT^bQ`6nuZEtTM78Yh;VBn=H z9B(Y0ZY`galXGW^Ot`+dj*d=ANlCT0dVjQWY;3HAgv6iSmcQ>-e_Wr?2DF8-B*-tA z!Qt7BG$5zi)5S5QB5v-v>s(HTJZulntlQjPyyt)Rt(Uz@NeXY-pZasH6v=wIj`#bC zCijIYoDSljvR^bvgo?~$IH9z-mqB9Pas!oy(8XriulxT_V_huC%^Rj++1H@UtL{YSy?$bIXOByIy*bNzP>&`KR-M?+~42d-QB&s zyj)mVn0e~wy+93&B|(0{3=Yq3qyafyo-U3d6>+`iy@i+*d0YeI{#}T_`#*`d*Gf=V zzj?_kAE%$nn>iVh=kzA7da&(^@I2NH*Ha(V?OA<$Z7lbJJCdhft@3&-csIUs(T{EG zqLn-6?Ur8fOmULOqpjO67o{nl?>Hr@Y3$ruwfQn5uV&BCtMnf0tam<`(Do@ju?eT9m<9&kb}HgQu&X%Q~loCIEHvX955K literal 0 HcmV?d00001 diff --git a/Source/Core/Compilers/AccCompiler.cs b/Source/Core/Compilers/AccCompiler.cs index 3e5f8788..7514b235 100644 --- a/Source/Core/Compilers/AccCompiler.cs +++ b/Source/Core/Compilers/AccCompiler.cs @@ -151,6 +151,7 @@ namespace CodeImp.DoomBuilder.Compilers Regex errlinematcher = new Regex(":[0-9]+: ", RegexOptions.Compiled | RegexOptions.CultureInvariant); // Read all lines + bool erroradded = false; //mxd string[] errlines = File.ReadAllLines(errfile); while(line < errlines.Length) { @@ -181,11 +182,18 @@ namespace CodeImp.DoomBuilder.Compilers // Report the error ReportError(err); + erroradded = true; //mxd } // Next line line++; } + + //mxd. Some ACC errors are not properly formatted. If that's the case, threat the whole acs.err as an error... + if(!erroradded && errlines.Length > 0) + { + ReportError(new CompilerError(string.Join(Environment.NewLine, errlines))); + } } catch(Exception e) { diff --git a/Source/Core/Controls/ScriptEditorPanel.cs b/Source/Core/Controls/ScriptEditorPanel.cs index 1a6c509d..0533e77b 100644 --- a/Source/Core/Controls/ScriptEditorPanel.cs +++ b/Source/Core/Controls/ScriptEditorPanel.cs @@ -383,10 +383,9 @@ namespace CodeImp.DoomBuilder.Controls ListViewItem ei = new ListViewItem(listindex.ToString()); ei.ImageIndex = 0; ei.SubItems.Add(e.description); - if(e.filename.StartsWith("?")) - ei.SubItems.Add(e.filename.Replace("?", "") + " (line " + (e.linenumber + 1) + ")"); - else - ei.SubItems.Add(Path.GetFileName(e.filename) + " (line " + (e.linenumber + 1) + ")"); + string filename = (e.filename.StartsWith("?") ? e.filename.Replace("?", "") : Path.GetFileName(e.filename)); //mxd + string linenumber = (e.linenumber != CompilerError.NO_LINE_NUMBER ? " (line " + (e.linenumber + 1) + ")" : String.Empty); //mxd + ei.SubItems.Add(filename + linenumber); ei.Tag = e; errorlist.Items.Add(ei); listindex++; diff --git a/Source/Plugins/BuilderModes/VisualModes/BaseVisualThing.cs b/Source/Plugins/BuilderModes/VisualModes/BaseVisualThing.cs index 5caa6cba..ce17ef77 100644 --- a/Source/Plugins/BuilderModes/VisualModes/BaseVisualThing.cs +++ b/Source/Plugins/BuilderModes/VisualModes/BaseVisualThing.cs @@ -122,7 +122,12 @@ namespace CodeImp.DoomBuilder.BuilderModes else if(Thing.Fields.ContainsKey("renderstyle")) { renderstyle = Thing.Fields.GetValue("renderstyle", renderstyle); - if(Thing.Fields.ContainsKey("alpha")) alpha = (byte)(General.Clamp(Thing.Fields.GetValue("alpha", info.Alpha), 0f, 1f) * 255); + } + + if((renderstyle == "add" || renderstyle == "translucent" || renderstyle == "subtract" || renderstyle == "stencil") + && Thing.Fields.ContainsKey("alpha")) + { + alpha = (byte)(General.Clamp(Thing.Fields.GetValue("alpha", info.Alpha), 0f, 1f) * 255); } } else if(General.Map.HEXEN)