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

Visual Mode: the effect of slope things are now only applied if they are specified in the game configuration

Browse source
This commit is contained in:
biwa 2023-10-21 16:11:35 +02:00
parent 807df65279
commit 728eea84b2
2 changed files with 25 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Source/Core/Config/GameConfiguration.cs
View file

@ -313,6 +313,7 @@ namespace CodeImp.DoomBuilder.Config
public List<FlagTranslation> ThingFlagsTranslation { get { return thingflagstranslation; } } public List<FlagTranslation> ThingFlagsTranslation { get { return thingflagstranslation; } }
public Dictionary<string, ThingFlagsCompareGroup> ThingFlagsCompare { get { return thingflagscompare; } } //mxd public Dictionary<string, ThingFlagsCompareGroup> ThingFlagsCompare { get { return thingflagscompare; } } //mxd
public Dictionary<string, string> ThingRenderStyles { get { return thingrenderstyles; } } //mxd public Dictionary<string, string> ThingRenderStyles { get { return thingrenderstyles; } } //mxd
public IReadOnlyDictionary<int, ThingTypeInfo> ThingTypes { get { return things; } }
// Linedefs // Linedefs
public IDictionary<string, string> LinedefFlags { get { return linedefflags; } } public IDictionary<string, string> LinedefFlags { get { return linedefflags; } }

41
Source/Plugins/BuilderModes/VisualModes/BaseVisualMode.cs
View file

@ -1154,20 +1154,22 @@ namespace CodeImp.DoomBuilder.BuilderModes
// Find interesting things (such as sector slopes) // Find interesting things (such as sector slopes)
// Pass one of slope things, and determine which one are for pass two // Pass one of slope things, and determine which one are for pass two
//TODO: rewrite using classnames instead of numbers
foreach (Thing t in General.Map.Map.Things) foreach (Thing t in General.Map.Map.Things)
{ {
switch (t.Type) if (!General.Map.Config.ThingTypes.ContainsKey(t.Type))
continue;
switch (General.Map.Config.ThingTypes[t.Type].ClassName.ToLowerInvariant())
{ {
// ========== Copy slope ========== // ========== Copy slope ==========
case 9511: case "$copyfloorplane": // 9511
case 9510: case "$copyceilingplane": // 9510
slopethingpass[1].Add(t); slopethingpass[1].Add(t);
break; break;
// ========== Thing line slope ========== // ========== Thing line slope ==========
case 9501: case "$slopeceilingpointline": // 9501
case 9500: case "$slopefloorpointline": // 9500
if(linetags.ContainsKey(t.Args[0])) if(linetags.ContainsKey(t.Args[0]))
{ {
// Only slope each sector once, even when multiple lines of the same sector are tagged. See https://github.com/jewalky/UltimateDoomBuilder/issues/491 // Only slope each sector once, even when multiple lines of the same sector are tagged. See https://github.com/jewalky/UltimateDoomBuilder/issues/491
@ -1193,8 +1195,8 @@ namespace CodeImp.DoomBuilder.BuilderModes
break; break;
// ========== Thing slope ========== // ========== Thing slope ==========
case 9503: case "$setceilingslope": // 9503
case 9502: case "$setfloorslope": // 9502
t.DetermineSector(blockmap); t.DetermineSector(blockmap);
if (t.Sector != null) if (t.Sector != null)
{ {
@ -1206,14 +1208,16 @@ namespace CodeImp.DoomBuilder.BuilderModes
} }
// Pass two of slope things // Pass two of slope things
//TODO: rewrite using classnames instead of numbers
foreach (Thing t in slopethingpass[1]) foreach (Thing t in slopethingpass[1])
{ {
switch (t.Type) if (!General.Map.Config.ThingTypes.ContainsKey(t.Type))
continue;
switch (General.Map.Config.ThingTypes[t.Type].ClassName.ToLowerInvariant())
{ {
// ========== Copy slope ========== // ========== Copy slope ==========
case 9511: case "$copyceilingplane": // 9511
case 9510: case "$copyfloorplane": // 9510
t.DetermineSector(blockmap); t.DetermineSector(blockmap);
if (t.Sector != null) if (t.Sector != null)
{ {
@ -1249,11 +1253,14 @@ namespace CodeImp.DoomBuilder.BuilderModes
{ {
if ((Vector2D)t.Position == v.Position) if ((Vector2D)t.Position == v.Position)
{ {
switch (t.Type) if (!General.Map.Config.ThingTypes.ContainsKey(t.Type))
{ continue;
case 1504: slopefloorthings.Add(t); break;
case 1505: slopeceilingthings.Add(t); break; switch (General.Map.Config.ThingTypes[t.Type].ClassName.ToLowerInvariant())
} {
case "$vertexfloorz": slopefloorthings.Add(t); break; // 1504
case "$vertexceilingz": slopeceilingthings.Add(t); break; // 1505
}
} }
} }
} }