diff --git a/Source/Core/Config/ArgumentInfo.cs b/Source/Core/Config/ArgumentInfo.cs index 0460afb4a8d77246eb6da9ff836c0175c9e3e5cf..8c302765ecc320ce835c3b8d63a739e6d8b1b8b0 100755 --- a/Source/Core/Config/ArgumentInfo.cs +++ b/Source/Core/Config/ArgumentInfo.cs @@ -244,13 +244,15 @@ namespace CodeImp.DoomBuilder.Config //mxd. Constructor for an argument info defined in DECORATE internal ArgumentInfo(string actorname, string argtitle, string tooltip, string renderstyle, string rendercolor, string minrange, string minrangecolor, string maxrange, string maxrangecolor, string targetclasses, - int type, int defaultvalue, string enumstr, IDictionary<string, EnumList> enums) + int type, int defaultvalue, string enumstr, IDictionary<string, EnumList> enums, bool str, string argtitlestr) { this.used = true; this.title = argtitle; this.tooltip = tooltip; this.defaultvalue = defaultvalue; this.flagslist = new EnumList(); //mxd + this.str = str; + this.titlestr = argtitlestr; // Get rendering hint settings switch(renderstyle.ToLowerInvariant()) diff --git a/Source/Core/Config/ThingTypeInfo.cs b/Source/Core/Config/ThingTypeInfo.cs index ea955e42161adebe12cb7f67f9c32b308d19238b..f3ac11c6dff78a1eb047305defc01dd0ea5dd5f4 100755 --- a/Source/Core/Config/ThingTypeInfo.cs +++ b/Source/Core/Config/ThingTypeInfo.cs @@ -484,7 +484,10 @@ namespace CodeImp.DoomBuilder.Config string argenum = ZDTextParser.StripQuotes(actor.GetPropertyAllValues("$arg" + i + "enum")); string argrenderstyle = ZDTextParser.StripQuotes(actor.GetPropertyAllValues("$arg" + i + "renderstyle")); string argrendercolor, minrange, maxrange, minrangecolor, maxrangecolor; - if(!string.IsNullOrEmpty(argrenderstyle)) + bool argstr = actor.HasProperty("$arg" + i + "allowstr"); + string argtitlestr = ZDTextParser.StripQuotes(actor.GetPropertyAllValues("$arg" + i + "str")); + if (string.IsNullOrEmpty(argtitlestr)) argtitlestr = argtitle; + if (!string.IsNullOrEmpty(argrenderstyle)) { argrendercolor = ZDTextParser.StripQuotes(actor.GetPropertyAllValues("$arg" + i + "rendercolor")); minrange = ZDTextParser.StripQuotes(actor.GetPropertyAllValues("$arg" + i + "minrange")); @@ -499,7 +502,7 @@ namespace CodeImp.DoomBuilder.Config args[i] = new ArgumentInfo(title, argtitle, argtooltip, argrenderstyle, argrendercolor, minrange, minrangecolor, maxrange, maxrangecolor, targetclasses, - argtype, defaultvalue, argenum, General.Map.Config.Enums); + argtype, defaultvalue, argenum, General.Map.Config.Enums, argstr, argtitlestr); } //mxd. Some SLADE compatibility