Skip to content

Commit 40bb669

Browse files
authored
Copy back ui changes to vehicle object (#120)
copy back ui changes to vehicle object
1 parent 3de55eb commit 40bb669

File tree

2 files changed

+27
-4
lines changed

2 files changed

+27
-4
lines changed

Dat/Objects/Vehicle/VehicleObject.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ public record VehicleObject(
3939
[property: LocoStructOffset(0x10C), LocoStructVariableLoad, Browsable(false)] uint8_t _NumSimultaneousCargoTypes,
4040
[property: LocoStructOffset(0x10D), LocoArrayLength(VehicleObject.AnimationCount)] SimpleAnimation[] Animation,
4141
[property: LocoStructOffset(0x113)] uint8_t var_113,
42-
[property: LocoStructOffset(0x114)] uint16_t Designed,
43-
[property: LocoStructOffset(0x116)] uint16_t Obsolete,
42+
[property: LocoStructOffset(0x114)] uint16_t DesignedYear,
43+
[property: LocoStructOffset(0x116)] uint16_t ObsoleteYear,
4444
[property: LocoStructOffset(0x118), LocoStructVariableLoad] uint8_t RackRailType,
4545
[property: LocoStructOffset(0x119)] DrivingSoundType SoundType,
4646
// this is a union...length is the length of the longest union struct, which is Engine2Sound. make the byte[] not visible in editor

Gui/ViewModels/DatTypes/DatObjectEditorViewModel.cs

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,8 @@ public void LoadObject()
129129
Animation = new(veh.Animation),
130130
AnimationHeaders = new(veh.AnimationHeaders),
131131
var_113 = veh.var_113,
132-
DesignedYear = veh.Designed,
133-
ObsoleteYear = veh.Obsolete,
132+
DesignedYear = veh.ObsoleteYear,
133+
ObsoleteYear = veh.ObsoleteYear,
134134
RackRailType = veh.RackRailType,
135135
SoundType = veh.SoundType,
136136
StartSounds = new(veh.StartSounds),
@@ -192,6 +192,29 @@ public void SaveCurrentObject()
192192

193193
CurrentObject.LocoObject.Object = veh with
194194
{
195+
Mode = VehicleVM.Mode,
196+
Type = VehicleVM.Type,
197+
var_04 = VehicleVM.var_04,
198+
TrackTypeId = VehicleVM.TrackTypeId,
199+
CostIndex = VehicleVM.CostIndex,
200+
CostFactor = VehicleVM.CostFactor,
201+
Reliability = VehicleVM.Reliability,
202+
RunCostIndex = VehicleVM.RunCostIndex,
203+
RunCostFactor = VehicleVM.RunCostFactor,
204+
ColourType = VehicleVM.ColourType,
205+
Power = VehicleVM.Power,
206+
Speed = VehicleVM.Speed,
207+
RackSpeed = VehicleVM.RackSpeed,
208+
Weight = VehicleVM.Weight,
209+
Flags = VehicleVM.Flags,
210+
var_113 = VehicleVM.var_113,
211+
DesignedYear = VehicleVM.DesignedYear,
212+
ObsoleteYear = VehicleVM.ObsoleteYear,
213+
RackRailType = VehicleVM.RackRailType,
214+
SoundType = VehicleVM.SoundType,
215+
SoundPropertyFriction = VehicleVM.FrictionSound,
216+
SoundPropertyEngine1 = VehicleVM.Engine1Sound,
217+
SoundPropertyEngine2 = VehicleVM.Engine2Sound,
195218
NumCompatibleVehicles = (byte)VehicleVM.CompatibleVehicles.Count,
196219
NumRequiredTrackExtras = (byte)VehicleVM.RequiredTrackExtras.Count,
197220
NumStartSounds = (byte)VehicleVM.StartSounds.Count,

0 commit comments

Comments
 (0)