Skip to content

Commit 6bcd59b

Browse files
committed
use road piece flags enum in roadextra
1 parent 7da5af2 commit 6bcd59b

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

Core/Objects/RoadExtraObject.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace OpenLoco.ObjectEditor.Objects
1010
[LocoStringTable("Name")]
1111
public record RoadExtraObject(
1212
[property: LocoStructOffset(0x00), LocoString, Browsable(false)] string_id Name,
13-
[property: LocoStructOffset(0x02)] uint16_t RoadPieces,
13+
[property: LocoStructOffset(0x02)] RoadObjectPieceFlags RoadPieces,
1414
[property: LocoStructOffset(0x04)] uint8_t PaintStyle,
1515
[property: LocoStructOffset(0x05)] uint8_t CostIndex,
1616
[property: LocoStructOffset(0x06)] int16_t BuildCostFactor,

Tests/LoadSaveTests.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
using Core.Objects;
22
using Core.Objects.Sound;
3+
using Microsoft.VisualBasic;
34
using NUnit.Framework;
45
using NUnit.Framework.Internal;
56
using OpenLoco.ObjectEditor.Data;
67
using OpenLoco.ObjectEditor.DatFileParsing;
78
using OpenLoco.ObjectEditor.Headers;
89
using OpenLoco.ObjectEditor.Objects;
910
using OpenLoco.ObjectEditor.Types;
11+
using static System.Formats.Asn1.AsnWriter;
1012
using Logger = OpenLoco.ObjectEditor.Logging.Logger;
1113

1214
namespace OpenLoco.ObjectEditor.Tests
@@ -531,7 +533,7 @@ void assertFunc(ILocoObject obj, RoadExtraObject struc) => Assert.Multiple(() =>
531533
Assert.That(struc.BuildCostFactor, Is.EqualTo(4), nameof(struc.BuildCostFactor));
532534
Assert.That(struc.CostIndex, Is.EqualTo(1), nameof(struc.CostIndex));
533535
Assert.That(struc.PaintStyle, Is.EqualTo(1), nameof(struc.PaintStyle));
534-
Assert.That(struc.RoadPieces, Is.EqualTo(127), nameof(struc.RoadPieces));
536+
Assert.That(struc.RoadPieces, Is.EqualTo(RoadObjectPieceFlags.OneWay | RoadObjectPieceFlags.Track | RoadObjectPieceFlags.Slope | RoadObjectPieceFlags.SteepSlope | RoadObjectPieceFlags.Intersection | RoadObjectPieceFlags.OneSided | RoadObjectPieceFlags.Overtake), nameof(struc.RoadPieces));
535537
Assert.That(struc.SellCostFactor, Is.EqualTo(-3), nameof(struc.SellCostFactor));
536538
Assert.That(struc.var_0E, Is.EqualTo(0), nameof(struc.var_0E));
537539
});

0 commit comments

Comments
 (0)