Skip to content

Commit d92e1f3

Browse files
committed
remove duplicated values from vehicleobjectflags (how would it work in the ui...)
1 parent d2b0628 commit d92e1f3

File tree

3 files changed

+20
-19
lines changed

3 files changed

+20
-19
lines changed
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
namespace OpenLoco.Dat.Objects
2+
{
3+
public enum CompanyColourType : uint8_t
4+
{
5+
None = 0,
6+
SteamLoco = 1,
7+
DieselLoco = 2,
8+
ElectricLoco = 3,
9+
MultipleUnit = 4,
10+
PassengerRailcar = 5,
11+
FreightRailcar = 6,
12+
BusAndTram = 7,
13+
FreightTruck = 8,
14+
Airplane = 9,
15+
Ship = 10,
16+
}
17+
}

Dat/Objects/Vehicle/VehicleObject.cs

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,6 @@
55

66
namespace OpenLoco.Dat.Objects
77
{
8-
public enum CompanyColourType : uint8_t
9-
{
10-
None = 0,
11-
SteamLoco = 1,
12-
DieselLoco = 2,
13-
ElectricLoco = 3,
14-
MultipleUnit = 4,
15-
PassengerRailcar = 5,
16-
FreightRailcar = 6,
17-
BusAndTram = 7,
18-
FreightTruck = 8,
19-
Airplane = 9,
20-
Ship = 10,
21-
}
228

239
[TypeConverter(typeof(ExpandableObjectConverter))]
2410
[LocoStructSize(0x15E)]

Dat/Objects/Vehicle/VehicleObjectFlags.cs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,9 @@ public enum VehicleObjectFlags : uint16_t
1818
AircraftIsTailDragger = 1 << 8,
1919
AnyRoadType = 1 << 9, // set on all road vehicles except trams
2020
SpeedControl = 1 << 10,
21-
CannotCoupleToSelf = 1 << 11,
22-
AircraftFlaresLanding = 1 << 11, // set only on Concorde
23-
MustHavePair = 1 << 12, // train requires two or more of this vehicle
24-
CanWheelSlip = 1 << 13, // set on all steam locomotives
25-
AircraftIsHelicopter = 1 << 13,
21+
CannotCoupleToSelf_AircraftFlaresLanding = 1 << 11, // set only on Concorde for aircraft
22+
MustHavePair = 1 << 12, // train requires two or more of this vehicle
23+
CanWheelSlip_AircraftIsHelicopter = 1 << 13, // set on all steam locomotives, or marks a helicopter for aircraft
2624
Refittable = 1 << 14,
2725
QuietInvention = 1 << 15, // no newspaper announcement
2826
};

0 commit comments

Comments
 (0)