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

Merge remote-tracking branch 'origin/master' into slimgl_merge

Browse source
This commit is contained in:
ZZYZX 2019-12-16 00:00:01 +02:00
commit eafce14a9a
2 changed files with 35 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -870,6 +870,11 @@ namespace CodeImp.DoomBuilder.ZDoom
switch (type)
{
case "int":
case "int8":
case "int16":
case "uint":
case "uint8":
case "uint16":
utype = UniversalType.Integer;
break;
case "float":
@ -877,7 +882,7 @@ namespace CodeImp.DoomBuilder.ZDoom
utype = UniversalType.Float;
break;
case "bool":
utype = UniversalType.Integer;
utype = UniversalType.Boolean;
break;
case "string":
utype = UniversalType.String;
@ -925,36 +930,33 @@ namespace CodeImp.DoomBuilder.ZDoom
break;
case UniversalType.Integer:
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();
if (sp == "true")
udefault = true;
else if (sp == "false")
udefault = false;
else parser.LogWarning("Incorrect boolean default from string \"" + sp + "\"");
break;
}
parser.LogWarning("Incorrect integer default from string \"" + sp + "\"");
break;
}
udefault = i;
break;
}
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;
}
}
udefault = i;
break;
case UniversalType.Boolean:
sp = sp.ToLowerInvariant();
if (sp == "true")
udefault = true;
else if (sp == "false")
udefault = false;
else
parser.LogWarning("Incorrect boolean default from string \"" + sp + "\"");
break;
}
}
for (int i = 0; i < names.Count; i++)

2
Source/Plugins/3DFloorMode/Resources/Actions.cfg
View file

@ -65,6 +65,7 @@ drawslopepoint
allowscroll = true;
disregardshift = true;
disregardcontrol = true;
default = 1; // Left mouse button
}
drawfloorslope
@ -105,6 +106,7 @@ finishslopedraw
allowkeys = true;
allowmouse = true;
allowscroll = true;
default = 2; // Right mouse button
}
threedflipslope