stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2024-11-26 13:51:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added: color user variable, //$UserReinterpret for color control on integer user variable

Browse source
This commit is contained in:
ZZYZX 2018-07-24 11:35:52 +03:00
parent 04dc210db5
commit 80b7d86cd8
3 changed files with 33 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Source/Core/Properties/AssemblyInfo.cs
View file

@ -30,6 +30,6 @@ using CodeImp.DoomBuilder;
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.3.0.3036")]
[assembly: AssemblyVersion("2.3.0.3037")]
[assembly: NeutralResourcesLanguageAttribute("en")]
[assembly: AssemblyHash("74e31b6")]
[assembly: AssemblyHash("04dc210")]

31
Source/Core/ZDoom/ZScriptActorStructure.cs
View file

@ -786,6 +786,23 @@ namespace CodeImp.DoomBuilder.ZDoom
continue; // go read next field
}
UniversalType utype_reinterpret = utype;
if (var_props.ContainsKey("$userreinterpret"))
{
string sp = var_props["$userreinterpret"][0].Trim().ToLowerInvariant();
switch (sp)
{
case "color":
if (utype != UniversalType.Integer)
{
parser.LogWarning("Cannot use $UserReinterpret Color with non-integers");
break;
}
utype_reinterpret = UniversalType.Color;
break;
}
}
if (var_props.ContainsKey("$userdefaultvalue"))
{
string sp = var_props["$userdefaultvalue"][0];
@ -809,6 +826,18 @@ namespace CodeImp.DoomBuilder.ZDoom
int i;
if (!int.TryParse(sp, out i))
{
if (utype_reinterpret == UniversalType.Color)
{
sp = sp.ToLowerInvariant();
Rendering.PixelColor pc;
if (!ZDTextParser.GetColorFromString(sp, out pc))
{
parser.LogWarning("Incorrect color default from string \"" + sp + "\"");
break;
}
udefault = pc.ToInt()&0xFFFFFF;
break;
}
if (type == "bool")
{
sp = sp.ToLowerInvariant();
@ -835,7 +864,7 @@ namespace CodeImp.DoomBuilder.ZDoom
if (!name.StartsWith("user_"))
continue; // we don't process non-user_ fields (because ZScript won't pick them up anyway)
// parent class is not guaranteed to be loaded already, so handle collisions later
uservars.Add(name, utype);
uservars.Add(name, utype_reinterpret);
if (udefault != null)
uservar_defaults.Add(name, udefault);
}

2
Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs
View file

@ -29,5 +29,5 @@ using System.Resources;
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.3.0.3036")]
[assembly: AssemblyVersion("2.3.0.3037")]
[assembly: NeutralResourcesLanguageAttribute("en")]