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

Changed, curved event lines, Visual mode: associated lines were not rendered as curved when the control object was not on screen [Xabis' patch #3].

Browse source 
Game configurations: removed "GZDoom only" from FraggleScript actions (because FraggleScript can be used in ZDoon).
Internal: fixed a couple of bugs in DebugConsole.StopTimer();
This commit is contained in:
MaxED 2015-08-16 23:42:57 +00:00
parent 1b26fa35f1
commit 415a3644c7
3 changed files with 43 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Build/Configurations/Includes/ZDoom_linedefs.cfg
View file

@ -9,44 +9,44 @@ doom
{
title = "Script";
270 // FraggleScript Execute
270
{
title = "FraggleScript Execute (GZDoom only)";
title = "FraggleScript Execute";
prefix = "WR";
}
273
{
title = "FraggleScript Execute one-way (GZDoom only)";
title = "FraggleScript Execute one-way";
prefix = "WR";
}
274
{
title = "FraggleScript Execute (GZDoom only)";
title = "FraggleScript Execute";
prefix = "W1";
}
275
{
title = "FraggleScript Execute one-way (GZDoom only)";
title = "FraggleScript Execute one-way";
prefix = "W1";
}
276
{
title = "FraggleScript Execute (GZDoom only)";
title = "FraggleScript Execute";
prefix = "SR";
}
277
{
title = "FraggleScript Execute (GZDoom only)";
title = "FraggleScript Execute";
prefix = "S1";
}
278
{
title = "FraggleScript Execute (GZDoom only)";
title = "FraggleScript Execute";
prefix = "GR";
}
279
{
title = "FraggleScript Execute (GZDoom only)";
title = "FraggleScript Execute";
prefix = "G1";
}
}
@ -2691,7 +2691,7 @@ zdoom
}
158
{
title = "FraggleScript Execute (GZDoom only)";
title = "FraggleScript Execute";
id = "FS_Execute";
arg0

18
Source/Core/Controls/DebugConsole.cs
View file

@ -3,6 +3,7 @@
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Globalization;
using System.Windows.Forms;
#endregion
@ -140,21 +141,16 @@ namespace CodeImp.DoomBuilder
public static void StopTimer(string message)
{
if (starttime == -1)
{
Write(DebugMessageType.WARNING, "Call General.Console.StartTimer before General.Console.StopTimer!");
}
else
{
long endtime = SlimDX.Configuration.Timer.ElapsedMilliseconds;
if(starttime == -1) throw new InvalidOperationException("DebugConsole.StartTimer() must be called before DebugConsole.StopTimer()!");
long duration = SlimDX.Configuration.Timer.ElapsedMilliseconds - starttime;
if (message.Contains("%"))
message = message.Replace("&", (endtime - starttime) + " ms.");
message = message.Replace("%", duration.ToString(CultureInfo.InvariantCulture));
else
message = message.TrimEnd() + " " + (endtime - starttime) + " ms.";
message = message.TrimEnd() + " " + duration + " ms.";
Write(DebugMessageType.SPECIAL, message);
}
WriteLine(DebugMessageType.SPECIAL, message);
starttime = -1;
}

46
Source/Core/GZBuilder/Data/LinksCollector.cs
View file

@ -113,6 +113,29 @@ namespace CodeImp.DoomBuilder.GZBuilder.Data
if(!result.PolyobjectStartSpots.ContainsKey(t.AngleDoom)) result.PolyobjectStartSpots[t.AngleDoom] = new List<Thing>();
result.PolyobjectStartSpots[t.AngleDoom].Add(t);
break;
}
// Process Thing_SetGoal action
if(t.Action != 0
&& General.Map.Config.LinedefActions.ContainsKey(t.Action)
&& General.Map.Config.LinedefActions[t.Action].Id.ToLowerInvariant() == "thing_setgoal"
&& (t.Args[0] == 0 || t.Args[0] == t.Tag)
&& t.Args[1] != 0)
{
result.ThingsWithGoal.Add(t);
}
}
// We may need all of these actors...
foreach (Thing t in General.Map.Map.Things)
{
ThingTypeInfo info = General.Map.Data.GetThingInfo(t.Type);
switch (info.ClassName.ToLowerInvariant())
{
case "interpolationpoint":
if(!result.InterpolationPoints.ContainsKey(t.Tag)) result.InterpolationPoints.Add(t.Tag, new List<PathNode>());
result.InterpolationPoints[t.Tag].Add(new PathNode(t, correctheight));
break;
case "movingcamera":
if(t.Args[0] != 0 || t.Args[1] != 0) result.Cameras.Add(t);
@ -130,29 +153,6 @@ namespace CodeImp.DoomBuilder.GZBuilder.Data
}
break;
}
// Process Thing_SetGoal action
if(t.Action != 0
&& General.Map.Config.LinedefActions.ContainsKey(t.Action)
&& General.Map.Config.LinedefActions[t.Action].Id.ToLowerInvariant() == "thing_setgoal"
&& (t.Args[0] == 0 || t.Args[0] == t.Tag)
&& t.Args[1] != 0)
{
result.ThingsWithGoal.Add(t);
}
}
// We may need all InterpolationPoints...
foreach (Thing t in General.Map.Map.Things)
{
ThingTypeInfo info = General.Map.Data.GetThingInfo(t.Type);
switch (info.ClassName.ToLowerInvariant())
{
case "interpolationpoint":
if(!result.InterpolationPoints.ContainsKey(t.Tag)) result.InterpolationPoints.Add(t.Tag, new List<PathNode>());
result.InterpolationPoints[t.Tag].Add(new PathNode(t, correctheight));
break;
}
}
return result;